diff options
| author | md_5 <git@md-5.net> | 2017-06-24 10:01:46 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-24 10:01:46 +1000 |
| commit | 753a8e700db5216abcc53eb56a9c26226c1ad9ed (patch) | |
| tree | 7459121295904532de38db1e98520427b8c60deb /nms-patches/EntityWolf.patch | |
| parent | 763827668e6e5cddc111f3c93a0d718fec21ff51 (diff) | |
| download | craftbukkit-753a8e700db5216abcc53eb56a9c26226c1ad9ed.tar craftbukkit-753a8e700db5216abcc53eb56a9c26226c1ad9ed.tar.gz craftbukkit-753a8e700db5216abcc53eb56a9c26226c1ad9ed.tar.lz craftbukkit-753a8e700db5216abcc53eb56a9c26226c1ad9ed.tar.xz craftbukkit-753a8e700db5216abcc53eb56a9c26226c1ad9ed.zip | |
SPIGOT-3324: Improve tameable damage handling
Diffstat (limited to 'nms-patches/EntityWolf.patch')
| -rw-r--r-- | nms-patches/EntityWolf.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nms-patches/EntityWolf.patch b/nms-patches/EntityWolf.patch index 3631a7a5..1efa3ef5 100644 --- a/nms-patches/EntityWolf.patch +++ b/nms-patches/EntityWolf.patch @@ -35,20 +35,19 @@ public void setGoalTarget(@Nullable EntityLiving entityliving) { super.setGoalTarget(entityliving); if (entityliving == null) { -@@ -200,9 +221,10 @@ +@@ -200,9 +221,9 @@ Entity entity = damagesource.getEntity(); if (this.goalSit != null) { - this.goalSit.setSitting(false); + // CraftBukkit - moved into EntityLiving.d(DamageSource, float) -+ // PAIL : checkme + // this.goalSit.setSitting(false); } - if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) { f = (f + 1.0F) / 2.0F; } -@@ -245,7 +267,7 @@ +@@ -245,7 +266,7 @@ itemstack.subtract(1); } @@ -57,7 +56,7 @@ return true; } } else if (itemstack.getItem() == Items.DYE) { -@@ -266,7 +288,7 @@ +@@ -266,7 +287,7 @@ this.goalSit.setSitting(!this.isSitting()); this.bd = false; this.navigation.p(); @@ -66,7 +65,7 @@ } } else if (itemstack.getItem() == Items.BONE && !this.isAngry()) { if (!entityhuman.abilities.canInstantlyBuild) { -@@ -274,12 +296,13 @@ +@@ -274,12 +295,13 @@ } if (!this.world.isClientSide) { |