diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-02-25 17:57:26 +0000 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-03-01 19:05:47 +0100 |
| commit | 0670ece7f3602602794b9636da073c21b7076377 (patch) | |
| tree | 9f5ba435024026b04777377795de79d13628913e | |
| parent | 1c2221f52fdb523aa5d4aaef74d8b105c38badc3 (diff) | |
| download | Essentials-0670ece7f3602602794b9636da073c21b7076377.tar Essentials-0670ece7f3602602794b9636da073c21b7076377.tar.gz Essentials-0670ece7f3602602794b9636da073c21b7076377.tar.lz Essentials-0670ece7f3602602794b9636da073c21b7076377.tar.xz Essentials-0670ece7f3602602794b9636da073c21b7076377.zip | |
Updating Bukkit: CB #1858, B #1334
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/OfflinePlayer.java | 17 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java | 6 | ||||
| -rw-r--r-- | lib/bukkit.jar | bin | 4614591 -> 4620068 bytes | |||
| -rw-r--r-- | lib/craftbukkit.jar | bin | 10786423 -> 10793996 bytes |
5 files changed, 19 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index a75e12aad..ff082efa7 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -66,7 +66,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements IEssentials { - public static final int BUKKIT_VERSION = 1938; + public static final int BUKKIT_VERSION = 1958; private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient ISettings settings; private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index 440d3fad3..ba5f97c71 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -172,11 +172,6 @@ public class OfflinePlayer implements Player return false; } - public boolean isPlayer() - { - return false; - } - @Override public int getRemainingAir() { @@ -901,4 +896,16 @@ public class OfflinePlayer implements Player { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public <T extends Projectile> T launchProjectile(Class<? extends T> arg0) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public EntityType getType() + { + return EntityType.PLAYER; + } } diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java index 0ea06e72b..f39c6e451 100644 --- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java +++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java @@ -584,4 +584,10 @@ public class FakeWorld implements World { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public LivingEntity spawnCreature(Location arg0, EntityType arg1) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/lib/bukkit.jar b/lib/bukkit.jar Binary files differindex e343a9723..aa22b004e 100644 --- a/lib/bukkit.jar +++ b/lib/bukkit.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar Binary files differindex d51826640..24d7801c3 100644 --- a/lib/craftbukkit.jar +++ b/lib/craftbukkit.jar |