spigot/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch

177 lines
6.4 KiB
Diff
Raw Normal View History

2021-12-11 00:00:00 +11:00
From 80d1f83021a82381247be16c7ae759b093125a60 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-12-11 00:00:00 +11:00
index 4a86693ee..7736d87d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2021-12-11 00:00:00 +11:00
@@ -2225,4 +2225,16 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
+
2021-01-31 10:08:46 +11:00
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
+ {
+
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.Server.Spigot spigot()
+ {
+ return spigot;
+ }
2021-01-31 10:08:46 +11:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-11-29 09:26:39 +11:00
index f98312b64..c510e29d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2021-11-29 09:26:39 +11:00
@@ -1740,4 +1740,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
2020-06-25 10:00:00 +10:00
public DragonBattle getEnderDragonBattle() {
2021-11-22 09:00:00 +11:00
return (getHandle().dragonFight() == null) ? null : new CraftDragonBattle(getHandle().dragonFight());
}
2019-04-23 12:00:00 +10:00
+
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
+ {
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.World.Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
2021-07-22 09:57:18 +10:00
index f9d3b5a49..b63472322 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
2021-03-09 08:47:45 +11:00
@@ -132,4 +132,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
getCaller().setOp(value);
}
+ // Spigot start
+ @Override
2021-03-09 08:47:45 +11:00
+ public org.bukkit.command.CommandSender.Spigot spigot()
+ {
+ return getCaller().spigot();
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
2021-07-22 09:57:18 +10:00
index 7fa2588b8..e0acbada8 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
2020-10-17 17:47:20 +11:00
@@ -90,4 +90,16 @@ public abstract class ServerCommandSender implements CommandSender {
2021-07-22 09:57:18 +10:00
public void sendMessage(UUID uuid, String... messages) {
2020-10-17 17:47:20 +11:00
this.sendMessage(messages); // ServerCommandSenders have no use for senders
}
+
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.command.CommandSender.Spigot spigot = new org.bukkit.command.CommandSender.Spigot()
+ {
+ };
+
+ @Override
2021-03-09 08:47:45 +11:00
+ public org.bukkit.command.CommandSender.Spigot spigot()
+ {
+ return spigot;
+ }
2013-08-03 19:54:36 +10:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2021-11-22 09:00:00 +11:00
index edd2276b6..6353807bc 100644
2013-08-03 19:54:36 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
2021-08-15 08:08:25 +10:00
@@ -1075,4 +1075,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
2016-03-23 07:34:06 +11:00
}
return perm;
2013-08-03 19:54:36 +10:00
}
+
+ // Spigot start
2021-03-09 08:47:45 +11:00
+ private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
2013-08-03 19:54:36 +10:00
+ {
+ };
+
2021-03-09 08:47:45 +11:00
+ public org.bukkit.entity.Entity.Spigot spigot()
2013-08-03 19:54:36 +10:00
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2021-06-15 18:31:06 +10:00
index 9ab9f0a31..e63833dcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2019-04-28 11:41:06 +10:00
@@ -29,4 +29,15 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
public EntityType getType() {
return EntityType.LIGHTNING;
}
+
+ // Spigot start
+ private final LightningStrike.Spigot spigot = new LightningStrike.Spigot() {
2016-11-17 12:41:12 +11:00
+
+ };
2016-11-17 12:41:12 +11:00
+
+ @Override
+ public LightningStrike.Spigot spigot() {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2021-12-11 00:00:00 +11:00
index e857e5c1b..8ae58649f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2021-12-11 00:00:00 +11:00
@@ -1760,4 +1760,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2021-11-23 09:01:35 +11:00
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}
+
+ // Spigot start
2013-08-03 19:59:46 +10:00
+ private final Player.Spigot spigot = new Player.Spigot()
+ {
+ };
+
2013-08-03 19:59:46 +10:00
+ public Player.Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
2021-11-22 09:00:00 +11:00
index ca9ea5eb0..4229c88dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
2021-03-09 08:47:45 +11:00
@@ -357,6 +357,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
2021-01-01 08:53:21 +11:00
if (this.pages != null) {
meta.pages = new ArrayList<String>(this.pages);
}
+ meta.spigot = meta.new SpigotMeta(); // Spigot
return meta;
}
2021-03-09 08:47:45 +11:00
@@ -430,4 +431,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
return builder;
}
+
+ // Spigot start
+ private BookMeta.Spigot spigot = new SpigotMeta();
+ private class SpigotMeta extends BookMeta.Spigot {
+ };
+
+ @Override
+ public BookMeta.Spigot spigot() {
+ return spigot;
+ }
+ // Spigot end
}
--
2021-01-31 10:08:46 +11:00
2.25.1