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

166 lines
5.5 KiB
Diff
Raw Normal View History

2017-05-14 12:00:00 +10:00
From f3c2f6971e039c423001a25274822c6ebdf6fbdc 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
2017-05-14 12:00:00 +10:00
index b7f0ef94..5e271dcb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2017-05-14 12:00:00 +10:00
@@ -1666,4 +1666,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
2017-05-14 12:00:00 +10:00
index 2574bee4..44354f98 100644
--- 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);
}
}
+ // 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/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
2017-04-14 15:11:45 +10:00
index 0e1d9343..f9cd769e 100644
--- 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();
}
+
+ // 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
2017-05-14 12:00:00 +10:00
index f1cfc7ad..0ce99fc8 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;
+ }
+ // 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
--- 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
2017-05-14 12:00:00 +10:00
index 92b4bc9a..2c58e916 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2017-05-14 12:00:00 +10:00
@@ -1446,4 +1446,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-01 08:33:06 +11:00
2017-05-14 12:00:00 +10:00
return new CraftAdvancementProgress(craft, data, progress);
}
+
+ // 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;
+ }
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;
+ }
+ // 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
--- 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 {
public CraftScoreboard getScoreboard() {
return objective.getScoreboard();
}
+
+ // Spigot start
+ @Override
+ public boolean isScoreSet() throws IllegalStateException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+ // Spigot end
}
--
2017-04-14 15:11:45 +10:00
2.11.0