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

175 lines
6.2 KiB
Diff
Raw Normal View History

2020-11-03 07:00:00 +11:00
From 4a8243f00c059da40932dd6d0def02a84eb44cd5 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
2020-09-19 17:51:05 +10:00
index 1b5c92469..d5c6ecac9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-09-19 17:51:05 +10:00
@@ -2020,4 +2020,14 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
+
+ private final Spigot spigot = new Spigot()
+ {
+
+ };
+
+ public Spigot spigot()
+ {
+ return spigot;
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 571108b53..8d01bd05f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2311,4 +2311,15 @@ public class CraftWorld implements World {
2020-06-25 10:00:00 +10:00
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}
2019-04-23 12:00:00 +10:00
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ public 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
2020-10-17 17:47:20 +11:00
index bafdde8a4..962f65ade 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
2020-10-17 17:47:20 +11:00
@@ -133,4 +133,11 @@ public class ProxiedNativeCommandSender implements ProxiedCommandSender {
getCaller().setOp(value);
}
+ // Spigot start
+ @Override
+ public 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
2020-10-17 17:47:20 +11:00
index d97716027..1f03a15d0 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 {
public void sendMessage(UUID uuid, String[] messages) {
this.sendMessage(messages); // ServerCommandSenders have no use for senders
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ @Override
+ public 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
2020-11-03 07:00:00 +11:00
index f8d1fb871..d4c50dbac 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
2020-11-03 07:00:00 +11:00
@@ -1003,4 +1003,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
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ public Spigot spigot()
+ {
+ 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
2020-06-25 10:00:00 +10:00
index 6c05cb414..e7e7d738e 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
2020-10-17 17:47:20 +11:00
index c50e2ae00..265890326 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-10-17 17:47:20 +11:00
@@ -1717,4 +1717,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2019-07-20 09:00:00 +10:00
getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.server.EnumHand.MAIN_HAND);
2019-06-08 19:53:26 +10:00
getInventory().setItemInMainHand(hand);
}
+
+ // 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
index 6a044c345..d32afdd96 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -284,6 +284,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
public CraftMetaBook clone() {
CraftMetaBook meta = (CraftMetaBook) super.clone();
meta.pages = new ArrayList<IChatBaseComponent>(pages);
+ meta.spigot = new SpigotMeta(); // Spigot
return meta;
}
@@ -353,4 +354,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
}
--
2.25.1