19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
41 lines
2 KiB
Diff
41 lines
2 KiB
Diff
From 2f9302529541e21254ecb789ba18f5d8b086740a Mon Sep 17 00:00:00 2001
|
|
From: drXor <mcyoungsota@gmail.com>
|
|
Date: Tue, 25 Feb 2014 15:15:26 -0400
|
|
Subject: [PATCH] Cancellable WitherSkull potion effect
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
|
|
index a4df9a1..b809e1b 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
|
|
@@ -35,8 +35,11 @@ public class EntityWitherSkull extends EntityFireball {
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
|
if (!this.world.isStatic) {
|
|
if (movingobjectposition.entity != null) {
|
|
+ // Spigot start
|
|
+ boolean didDamage = false;
|
|
if (this.shooter != null) {
|
|
- if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) {
|
|
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F);
|
|
+ if (didDamage) {
|
|
if (!movingobjectposition.entity.isAlive()) {
|
|
this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
|
|
} else {
|
|
@@ -44,10 +47,11 @@ public class EntityWitherSkull extends EntityFireball {
|
|
}
|
|
}
|
|
} else {
|
|
- movingobjectposition.entity.damageEntity(DamageSource.MAGIC, 5.0F);
|
|
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.MAGIC, 5.0F);
|
|
}
|
|
|
|
- if (movingobjectposition.entity instanceof EntityLiving) {
|
|
+ if (didDamage && movingobjectposition.entity instanceof EntityLiving) {
|
|
+ // Spigot end
|
|
byte b0 = 0;
|
|
|
|
if (this.world.getDifficulty() == EnumDifficulty.NORMAL) {
|
|
--
|
|
2.1.0
|
|
|