diff options
| author | feildmaster <admin@feildmaster.com> | 2012-11-15 19:20:45 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-11-15 19:26:39 -0600 |
| commit | 8e806550d7627d3cac3226bacef11ce73dd69bda (patch) | |
| tree | 2d20d2239d79c1504416f1eb86a89a21f5b60701 /src/main | |
| parent | 6149fc3e789678f9e80430f93b99b4f89baeb15d (diff) | |
| download | craftbukkit-8e806550d7627d3cac3226bacef11ce73dd69bda.tar craftbukkit-8e806550d7627d3cac3226bacef11ce73dd69bda.tar.gz craftbukkit-8e806550d7627d3cac3226bacef11ce73dd69bda.tar.lz craftbukkit-8e806550d7627d3cac3226bacef11ce73dd69bda.tar.xz craftbukkit-8e806550d7627d3cac3226bacef11ce73dd69bda.zip | |
Remove fire ticks if damage has been canceled. Fixes BUKKIT-2933
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 47de470a..64abd730 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -795,6 +795,9 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen // CraftBukkit start - Return when the damage fails so that the item will not lose durability if (!flag2) { + if (flag1) { + entity.extinguish(); + } return; } // CraftBukkit end |