From d0795fc3e78b2feb58f4b92506a312bc0834632d Mon Sep 17 00:00:00 2001 From: GunfighterJ Date: Mon, 1 Jul 2013 21:38:27 -0500 Subject: Update Essentials for Bukkit 1.6.1-R0.1-SNAPSHOT --- .../src/com/earth2me/essentials/Essentials.java | 2 +- Essentials/src/com/earth2me/essentials/Mob.java | 1 + .../src/com/earth2me/essentials/OfflinePlayer.java | 64 ++++++++++++++++++--- .../src/com/earth2me/essentials/TimedTeleport.java | 2 +- .../earth2me/essentials/commands/Commandheal.java | 4 +- lib/bukkit.jar | Bin 4870820 -> 4890921 bytes lib/craftbukkit.jar | Bin 12973435 -> 15233037 bytes 7 files changed, 61 insertions(+), 12 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 9689ea923..d9bb6fc2c 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -73,7 +73,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements IEssentials { - public static final int BUKKIT_VERSION = 2763; + public static final int BUKKIT_VERSION = 2794; 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/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index 3afcf1b85..4af62d37f 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -21,6 +21,7 @@ public enum Mob CREEPER("Creeper", Enemies.ENEMY, EntityType.CREEPER), GHAST("Ghast", Enemies.ENEMY, EntityType.GHAST), GIANT("Giant", Enemies.ENEMY, EntityType.GIANT), + HORSE("Horse", Enemies.FRIENDLY, EntityType.HORSE), PIG("Pig", Enemies.FRIENDLY, EntityType.PIG), PIGZOMB("PigZombie", Enemies.NEUTRAL, EntityType.PIG_ZOMBIE), SHEEP("Sheep", Enemies.FRIENDLY, "", EntityType.SHEEP), diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index b8790ab00..3e00839e6 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -92,13 +92,13 @@ public class OfflinePlayer implements Player } @Override - public int getHealth() + public double getHealth() { return 0; } @Override - public void setHealth(int i) + public void setHealth(double d) { } @@ -307,13 +307,13 @@ public class OfflinePlayer implements Player } @Override - public void damage(int i) + public void damage(double d) { throw new UnsupportedOperationException(_("notSupportedYet")); } @Override - public void damage(int i, Entity entity) + public void damage(double d, Entity entity) { throw new UnsupportedOperationException(_("notSupportedYet")); } @@ -349,13 +349,13 @@ public class OfflinePlayer implements Player } @Override - public int getLastDamage() + public double getLastDamage() { throw new UnsupportedOperationException(_("notSupportedYet")); } @Override - public void setLastDamage(int i) + public void setLastDamage(double d) { throw new UnsupportedOperationException(_("notSupportedYet")); } @@ -762,7 +762,7 @@ public class OfflinePlayer implements Player } @Override - public int getMaxHealth() + public double getMaxHealth() { throw new UnsupportedOperationException("Not supported yet."); } @@ -1161,7 +1161,7 @@ public class OfflinePlayer implements Player } @Override - public void setMaxHealth(int i) + public void setMaxHealth(double i) { throw new UnsupportedOperationException("Not supported yet."); } @@ -1231,4 +1231,52 @@ public class OfflinePlayer implements Player { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public int _INVALID_getLastDamage() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void _INVALID_setLastDamage(int i) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void _INVALID_damage(int i) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void _INVALID_damage(int i, Entity entity) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public int _INVALID_getHealth() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void _INVALID_setHealth(int i) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public int _INVALID_getMaxHealth() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public void _INVALID_setMaxHealth(int i) + { + throw new UnsupportedOperationException("Not supported yet."); + } } diff --git a/Essentials/src/com/earth2me/essentials/TimedTeleport.java b/Essentials/src/com/earth2me/essentials/TimedTeleport.java index f8a6d9d75..66867ea14 100644 --- a/Essentials/src/com/earth2me/essentials/TimedTeleport.java +++ b/Essentials/src/com/earth2me/essentials/TimedTeleport.java @@ -15,7 +15,7 @@ public class TimedTeleport implements Runnable private int timer_task = -1; private long timer_started; // time this task was initiated private long timer_delay; // how long to delay the teleportPlayer - private int timer_health; + private double timer_health; // note that I initially stored a clone of the location for reference, but... // when comparing locations, I got incorrect mismatches (rounding errors, looked like) // so, the X/Y/Z values are stored instead and rounded off diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java index 7a1ede603..52816ba4a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandheal.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandheal.java @@ -90,7 +90,7 @@ public class Commandheal extends EssentialsCommand throw new Exception(_("healDead")); } - final int amount = player.getMaxHealth() - player.getHealth(); + final double amount = player.getMaxHealth() - player.getHealth(); final EntityRegainHealthEvent erhe = new EntityRegainHealthEvent(player, amount, RegainReason.CUSTOM); ess.getServer().getPluginManager().callEvent(erhe); if (erhe.isCancelled()) @@ -98,7 +98,7 @@ public class Commandheal extends EssentialsCommand throw new QuietAbortException(); } - int newAmount = player.getHealth() + erhe.getAmount(); + double newAmount = player.getHealth() + erhe.getAmount(); if (newAmount > player.getMaxHealth()) { newAmount = player.getMaxHealth(); diff --git a/lib/bukkit.jar b/lib/bukkit.jar index 319866585..943b6335a 100644 Binary files a/lib/bukkit.jar and b/lib/bukkit.jar differ diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar index 5ded45df9..193475bbc 100644 Binary files a/lib/craftbukkit.jar and b/lib/craftbukkit.jar differ -- cgit v1.2.3