PaperMC/CraftBukkit-Patches/0082-Cancellable-WitherSkull-potion-effect.patch

41 lines
2 KiB
Diff
Raw Normal View History

2016-03-01 01:23:45 +01:00
From 9d8a4d8b4809e707fe190917ba287f66d040cb01 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
2016-02-29 22:33:06 +01:00
index 1080b00..edac23d 100644
--- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
+++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
2016-02-29 22:33:06 +01:00
@@ -38,8 +38,11 @@ public class EntityWitherSkull extends EntityFireball {
protected void a(MovingObjectPosition movingobjectposition) {
2015-02-28 12:36:22 +01:00
if (!this.world.isClientSide) {
if (movingobjectposition.entity != null) {
+ // Spigot start
2015-01-25 00:37:00 +01:00
+ boolean didDamage = false;
if (this.shooter != null) {
2015-01-25 00:37:00 +01:00
- if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F);
2014-11-28 02:17:45 +01:00
+ if (didDamage) {
if (!movingobjectposition.entity.isAlive()) {
this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
} else {
2016-02-29 22:33:06 +01:00
@@ -47,10 +50,11 @@ public class EntityWitherSkull extends EntityFireball {
2014-11-28 02:17:45 +01:00
}
}
} 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;
2014-11-28 02:17:45 +01:00
if (this.world.getDifficulty() == EnumDifficulty.NORMAL) {
--
2016-02-29 22:33:06 +01:00
2.5.0