diff options
author | Feildmaster <admin@feildmaster.com> | 2012-02-22 11:03:56 -0600 |
---|---|---|
committer | EvilSeph <evilseph@gmail.com> | 2012-02-23 18:27:22 -0500 |
commit | 796d4a8a74d640ee00a4e0480eded756aac518f7 (patch) | |
tree | 521a300f5b67c4cd21010ce90fd8ce38d43baf6c /src | |
parent | d7f6d2d929b1ec1d0da53e5262756e0e1ee85977 (diff) | |
download | craftbukkit-796d4a8a74d640ee00a4e0480eded756aac518f7.tar craftbukkit-796d4a8a74d640ee00a4e0480eded756aac518f7.tar.gz craftbukkit-796d4a8a74d640ee00a4e0480eded756aac518f7.tar.lz craftbukkit-796d4a8a74d640ee00a4e0480eded756aac518f7.tar.xz craftbukkit-796d4a8a74d640ee00a4e0480eded756aac518f7.zip |
[Bleeding] Fixed setTotalExp, any experience update bugs and removed Deprecated Methods. Fixes BUKKIT-798 and fixes BUKKIT-797
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index fe9e72b6..7311039d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -65,10 +65,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { perm.recalculatePermissions(); } - public boolean isPlayer() { - return true; - } - public boolean isOnline() { for (Object obj : server.getHandle().players) { EntityPlayer player = (EntityPlayer) obj; @@ -486,20 +482,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setExp(float exp) { getHandle().exp = exp; - - giveExp(0); - } - - public int getExperience() { - return (int) (getExp() * 100); - } - - public void setExperience(int exp) { - setExp(exp / 100); + getHandle().lastSentExp = -1; } public int getLevel() { - return (int) getHandle().expLevel; + return getHandle().expLevel; } public void setLevel(int level) { @@ -513,11 +500,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setTotalExperience(int exp) { getHandle().expTotal = exp; - getHandle().lastSentExp = -1; - - if (getTotalExperience() > getExperience()) { - getHandle().expTotal = getTotalExperience(); - } } public float getExhaustion() { |