diff options
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 2 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/FakeWorld.java | 33 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/OfflinePlayer.java | 18 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/PlayerWrapper.java | 15 | ||||
-rw-r--r-- | Essentials/test/com/earth2me/essentials/FakeServer.java | 21 | ||||
-rw-r--r-- | lib/bukkit-0.0.1-SNAPSHOT.jar | bin | 2635298 -> 2655977 bytes | |||
-rw-r--r-- | lib/craftbukkit-0.0.1-SNAPSHOT.jar | bin | 7588688 -> 7624904 bytes |
7 files changed, 88 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index edd27bbf7..4b9e74d4e 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -42,7 +42,7 @@ import org.bukkit.plugin.java.*; public class Essentials extends JavaPlugin implements IEssentials { public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology"; - public static final int minBukkitBuildVersion = 818; + public static final int minBukkitBuildVersion = 860; private static final Logger logger = Logger.getLogger("Minecraft"); private Settings settings; private TNTExplodeListener tntListener; diff --git a/Essentials/src/com/earth2me/essentials/FakeWorld.java b/Essentials/src/com/earth2me/essentials/FakeWorld.java index ef016d242..befe9db8b 100644 --- a/Essentials/src/com/earth2me/essentials/FakeWorld.java +++ b/Essentials/src/com/earth2me/essentials/FakeWorld.java @@ -3,6 +3,7 @@ package com.earth2me.essentials; import java.util.List; import org.bukkit.BlockChangeDelegate; import org.bukkit.Chunk; +import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.TreeType; import org.bukkit.World; @@ -18,6 +19,8 @@ import org.bukkit.entity.Minecart; import org.bukkit.entity.Player; import org.bukkit.entity.PoweredMinecart; import org.bukkit.entity.StorageMinecart; +import org.bukkit.generator.BlockPopulator; +import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.ItemStack; import org.bukkit.util.Vector; @@ -322,5 +325,35 @@ public class FakeWorld implements World { throw new UnsupportedOperationException("Not supported yet."); } + + public boolean createExplosion(double d, double d1, double d2, float f) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean createExplosion(Location lctn, float f) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public ChunkGenerator getGenerator() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public List<BlockPopulator> getPopulators() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void playEffect(Location lctn, Effect effect, int i) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void playEffect(Location lctn, Effect effect, int i, int i1) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 0c388e55b..bd80b057e 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -3,7 +3,9 @@ package com.earth2me.essentials; import java.net.InetSocketAddress; import java.util.HashSet; import java.util.List; +import java.util.UUID; import org.bukkit.Achievement; +import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Server; @@ -28,6 +30,7 @@ public class OfflinePlayer implements Player final IEssentials ess = Essentials.getStatic(); private Location location = new Location(null, 0, 0, 0, 0, 0); private World world = null; + private UUID uniqueId = UUID.randomUUID(); public OfflinePlayer(String name) { @@ -461,4 +464,19 @@ public class OfflinePlayer implements Player { throw new UnsupportedOperationException(Util.i18n("notSupportedYet")); } + + public void playEffect(Location lctn, Effect effect, int i) + { + throw new UnsupportedOperationException(Util.i18n("notSupportedYet")); + } + + public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes) + { + return true; + } + + public UUID getUniqueId() + { + return uniqueId; + } } diff --git a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java index 9d1b64f88..a9666f64b 100644 --- a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java +++ b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java @@ -515,4 +515,19 @@ public class PlayerWrapper implements Player { return base.getLastDamageCause(); } + + public void playEffect(Location lctn, Effect effect, int i) + { + base.playEffect(lctn, effect, i); + } + + public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes) + { + return base.sendChunkChange(lctn, i, i1, i2, bytes); + } + + public UUID getUniqueId() + { + return base.getUniqueId(); + } } diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java index 5594f36b1..07483fed7 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -11,6 +11,7 @@ import org.bukkit.World.Environment; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Player; +import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.Recipe; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.ServicesManager; @@ -197,4 +198,24 @@ public class FakeServer implements Server player.setLocation(new Location(worlds.get(0), 0, 0, 0, 0, 0)); return player; } + + public World createWorld(String string, Environment e, ChunkGenerator cg) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public World createWorld(String string, Environment e, long l, ChunkGenerator cg) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean unloadWorld(String string, boolean bln) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public boolean unloadWorld(World world, boolean bln) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/lib/bukkit-0.0.1-SNAPSHOT.jar b/lib/bukkit-0.0.1-SNAPSHOT.jar Binary files differindex dbf7ed580..27ea01ac7 100644 --- a/lib/bukkit-0.0.1-SNAPSHOT.jar +++ b/lib/bukkit-0.0.1-SNAPSHOT.jar diff --git a/lib/craftbukkit-0.0.1-SNAPSHOT.jar b/lib/craftbukkit-0.0.1-SNAPSHOT.jar Binary files differindex 3e0b82cc9..b0a398b75 100644 --- a/lib/craftbukkit-0.0.1-SNAPSHOT.jar +++ b/lib/craftbukkit-0.0.1-SNAPSHOT.jar |