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

206 lines
6.7 KiB
Diff
Raw Normal View History

2019-04-23 09:33:25 +10:00
From f22a980951909c9700aceab04f7094687c5b3abb 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
2019-04-23 09:33:25 +10:00
index 6cc730b1..c53eeb62 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2019-04-23 09:33:25 +10:00
@@ -1919,4 +1919,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
2019-04-23 09:33:25 +10:00
index 4d20ce99..334dd972 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1769,4 +1769,14 @@ public class CraftWorld implements World {
2016-05-10 21:48:25 +10:00
cps.unload(chunk);
}
}
+ // 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
2019-04-23 09:33:25 +10:00
index 07c34cb2..7609e861 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
@@ -123,4 +123,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
2019-04-23 09:33:25 +10:00
index 1314c744..a461a935 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
@@ -68,4 +68,16 @@ public abstract class ServerCommandSender implements CommandSender {
public Server getServer() {
return Bukkit.getServer();
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ @Override
+ public Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2019-04-23 09:33:25 +10:00
index 75dad21c..4b8e5ab2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
@@ -105,4 +105,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
2018-01-05 13:05:55 +11:00
public EntityType getType() {
return EntityType.ARROW;
}
+
+ // Spigot start
2013-08-03 19:59:46 +10:00
+ private final Arrow.Spigot spigot = new Arrow.Spigot()
+ {
+ };
2013-08-03 19:59:46 +10:00
+
+ public Arrow.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
2019-04-23 09:33:25 +10:00
index aca45328..d7f43ec2 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
2019-04-23 09:33:25 +10:00
@@ -782,4 +782,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
2019-04-23 09:33:25 +10:00
index 64e346d8..194d830e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -27,4 +27,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
2019-04-23 09:33:25 +10:00
index 23277f40..16e5c03d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2019-04-23 09:33:25 +10:00
@@ -1611,4 +1611,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2018-08-12 09:43:06 +10:00
getHandle().server.getCommandDispatcher().a(getHandle());
}
+
+ // 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
2019-04-23 09:33:25 +10:00
index 0831e13e..adb21dd2 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
2018-12-10 11:22:12 +11:00
@@ -343,4 +343,14 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
return builder;
}
+
+ // Spigot start
+ private final BookMeta.Spigot spigot = new BookMeta.Spigot() {
+ };
+
+ @Override
+ public BookMeta.Spigot spigot() {
+ return spigot;
+ }
2014-08-25 19:02:51 +10:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
2019-04-23 09:33:25 +10:00
index df1eb143..a463c88a 100644
2014-08-25 19:02:51 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
2019-04-02 21:23:20 +11:00
@@ -1283,4 +1283,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
2015-01-18 18:17:11 +00:00
return HANDLED_TAGS;
2014-12-15 15:53:27 +00:00
}
2014-08-25 19:02:51 +10:00
}
+
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ @Override
+ public Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
}
--
2019-04-23 09:33:25 +10:00
2.20.1