PaperMC/CraftBukkit-Patches/0142-Fix-explosions-not-moving-invulnerable-entities.patch
Zach Brown 5b4bc3081a Update from upstream SpigotMC
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
2014-08-18 10:43:17 -05:00

25 lines
1.1 KiB
Diff

From c4145784b7b40a92675b5def974a12ed996a0817 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Thu, 26 Jun 2014 14:29:11 +0100
Subject: [PATCH] Fix explosions not moving invulnerable entities
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 4502f68..d876a63 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -130,9 +130,9 @@ public class Explosion {
// CraftBukkit start
CraftEventFactory.entityDamage = source;
if (!entity.damageEntity(DamageSource.explosion(this), (float) ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.size + 1.0D)))) {
- CraftEventFactory.entityDamage = null;
- continue;
+
}
+ CraftEventFactory.entityDamage = null;
// CraftBukkit end
double d11 = EnchantmentProtection.a(entity, d10);
--
1.9.1