From 585aa75a6399add688fa0e4c386ad1c6ef22834a Mon Sep 17 00:00:00 2001 From: md_5 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 index e3d5b7bd2..52ce4b649 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1929,4 +1929,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 eea897495..15deccd36 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2270,4 +2270,15 @@ public class CraftWorld implements World { PersistentRaid persistentRaid = world.getPersistentRaid(); return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } + + // 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 index 477e92096..ce2c5c38c 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ProxiedNativeCommandSender.java @@ -122,4 +122,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 993b57b8d..0459f5dfb 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java @@ -79,4 +79,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/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index ed700e398..57850343e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -977,4 +977,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return perm; } + + // 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 index cb1efe969..1d4ba473a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java @@ -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() { + + }; + + @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 index 4109e6b0b..5c60a52e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1669,4 +1669,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().openBook(org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(book), net.minecraft.server.EnumHand.MAIN_HAND); getInventory().setItemInMainHand(hand); } + + // Spigot start + private final Player.Spigot spigot = new Player.Spigot() + { + }; + + 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 ab7e3ba63..7eeccddf0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -354,4 +354,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; + } + // Spigot end } -- 2.20.1