spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always clear entityDamage on explosion

Browse source
This commit is contained in:
Thinkofdeath 2014-06-27 00:13:41 +01:00
parent a5c5ebeca4
commit c1e3bc4079
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CraftBukkit-Patches/0149-Fix-explosions-not-moving-invulnerable-entities.patch
View file

@ -1,21 +1,25 @@
From cff8e2420ee1c3aef0f01af3fced6a473983b47c Mon Sep 17 00:00:00 2001
From e63b8d6cb4908fcf6c535c282883bf8c3fabfdf0 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..fd51102 100644
index 4502f68..d876a63 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -131,7 +131,6 @@ public class Explosion {
@@ -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;
- CraftEventFactory.entityDamage = null;
- continue;
+
}
+ CraftEventFactory.entityDamage = null;
// CraftBukkit end
double d11 = EnchantmentProtection.a(entity, d10);
--
1.9.1