2017-05-27 19:09:48 +10:00
From 00f15553fd0317b2750f564653d327f2556b1da6 Mon Sep 17 00:00:00 2001
2013-06-02 15:15:15 +10:00
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
2014-07-05 20:34:22 +10:00
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.
2013-06-02 15:15:15 +10:00
2014-08-25 20:09:32 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2017-05-15 15:44:15 +10:00
index fc92b912..f392f3c8 100644
2014-08-25 20:09:32 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2017-05-15 15:44:15 +10:00
@@ -1677,4 +1677,14 @@ public final class CraftServer implements Server {
2014-08-25 20:09:32 +01:00
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
+
+ private final Spigot spigot = new Spigot()
+ {
+
+ };
+
+ public Spigot spigot()
+ {
+ return spigot;
+ }
}
2013-06-02 16:15:22 +10:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2017-05-14 12:00:00 +10:00
index 2574bee4..44354f98 100644
2013-06-02 16:15:22 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2017-05-14 12:00:00 +10:00
@@ -1554,4 +1554,14 @@ public class CraftWorld implements World {
2016-05-10 21:48:25 +10:00
cps.unload(chunk);
2013-06-02 16:15:22 +10:00
}
}
+ // Spigot start
+ private final Spigot spigot = new Spigot()
+ {
+ };
+
+ public Spigot spigot()
+ {
+ return spigot;
+ }
+ // Spigot end
2017-05-15 15:44:15 +10:00
}
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java
index 9acd92c3..8ae85a92 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
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
2013-06-02 16:15:22 +10:00
}
2013-06-02 15:15:15 +10:00
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2017-04-14 15:11:45 +10:00
index 0e1d9343..f9cd769e 100644
2013-06-02 15:15:15 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2017-01-18 10:14:37 +11:00
@@ -83,4 +83,15 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
2014-01-31 20:42:29 +00:00
public void _INVALID_setShooter(LivingEntity shooter) {
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
2013-06-02 15:15:15 +10:00
}
+
+ // Spigot start
2013-08-03 19:59:46 +10:00
+ private final Arrow.Spigot spigot = new Arrow.Spigot()
2013-06-02 15:15:15 +10:00
+ {
+ };
2013-08-03 19:59:46 +10:00
+
+ public Arrow.Spigot spigot()
2013-06-02 15:15:15 +10:00
+ {
+ 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
2017-05-27 19:09:48 +10:00
index 4fa2687d..35c44b82 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
2017-05-14 12:00:00 +10:00
@@ -704,4 +704,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;
+ }
2014-11-26 08:27:08 +11:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2017-04-14 15:11:45 +10:00
index 64e346d8..194d830e 100644
2014-11-26 08:27:08 +11:00
--- 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
+
2014-11-26 08:27:08 +11:00
+ };
2016-11-17 12:41:12 +11:00
+
2014-11-26 08:27:08 +11:00
+ @Override
+ public LightningStrike.Spigot spigot() {
+ return spigot;
+ }
2013-06-02 15:22:22 +10:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-05-27 19:09:48 +10:00
index 4764e70a..27235919 100644
2013-06-02 15:22:22 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-05-27 19:09:48 +10:00
@@ -1450,4 +1450,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public String getLocale() {
return getHandle().locale;
2013-06-02 15:22:22 +10:00
}
+
+ // Spigot start
2013-08-03 19:59:46 +10:00
+ private final Player.Spigot spigot = new Player.Spigot()
2013-06-02 15:22:22 +10:00
+ {
+ };
+
2013-08-03 19:59:46 +10:00
+ public Player.Spigot spigot()
2013-06-02 15:22:22 +10:00
+ {
+ 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
2017-05-14 12:00:00 +10:00
index 7882e889..426b2b3b 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
2017-05-14 12:00:00 +10:00
@@ -898,4 +898,16 @@ class CraftMetaItem implements ItemMeta, 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;
+ }
2014-11-26 08:27:08 +11:00
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
2017-04-14 15:11:45 +10:00
index d3ae91bc..0b71b538 100644
2014-11-26 08:27:08 +11:00
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScore.java
2015-01-17 10:12:14 +11:00
@@ -59,4 +59,11 @@ final class CraftScore implements Score {
2014-11-26 08:27:08 +11:00
public CraftScoreboard getScoreboard() {
return objective.getScoreboard();
}
+
+ // Spigot start
+ @Override
+ public boolean isScoreSet() throws IllegalStateException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // Spigot end
2013-06-02 15:15:15 +10:00
}
--
2017-04-14 15:11:45 +10:00
2.11.0
2013-06-02 15:15:15 +10:00