ffb572ce9a
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
From 65e62f2e8061d17c5703124546f56bb1b1b7fb64 Mon Sep 17 00:00:00 2001
|
|
From: Iceee <andrew@opticgaming.tv>
|
|
Date: Wed, 2 Mar 2016 01:39:52 -0600
|
|
Subject: [PATCH] Fix lag from explosions processing dead entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
|
|
index 904bee8b..4e05bcdf 100644
|
|
--- a/src/main/java/net/minecraft/server/Explosion.java
|
|
+++ b/src/main/java/net/minecraft/server/Explosion.java
|
|
@@ -104,7 +104,14 @@ public class Explosion {
|
|
int i1 = MathHelper.floor(this.posY + (double) f3 + 1.0D);
|
|
int j1 = MathHelper.floor(this.posZ - (double) f3 - 1.0D);
|
|
int k1 = MathHelper.floor(this.posZ + (double) f3 + 1.0D);
|
|
- List list = this.world.getEntities(this.source, new AxisAlignedBB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1));
|
|
+ // Paper start - Fix lag from explosions processing dead entities
|
|
+ List list = this.world.getEntities(this.source, new AxisAlignedBB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1), new com.google.common.base.Predicate<Entity>() {
|
|
+ @Override
|
|
+ public boolean apply(Entity entity) {
|
|
+ return IEntitySelector.d.apply(entity) && !entity.dead;
|
|
+ }
|
|
+ });
|
|
+ // Paper end
|
|
Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ);
|
|
|
|
for (int l1 = 0; l1 < list.size(); ++l1) {
|
|
--
|
|
2.12.2
|
|
|