2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2015-06-02 05:56:10 +00:00
|
|
|
From: Iceee <andrew@opticgaming.tv>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Wed, 2 Mar 2016 01:39:52 -0600
|
2015-06-02 05:56:10 +00:00
|
|
|
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
|
2020-05-06 09:48:49 +00:00
|
|
|
index eb7b8d94c83c3f3be0a7f019dad7dd87da5347fe..a063d1bfaa1acd20a5de9701eef028a543235d5e 100644
|
2015-06-02 05:56:10 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Explosion.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Explosion.java
|
2019-12-11 00:56:03 +00:00
|
|
|
@@ -151,7 +151,14 @@ public class Explosion {
|
2015-06-02 05:56:10 +00:00
|
|
|
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);
|
2019-01-01 03:15:55 +00:00
|
|
|
- List<Entity> list = this.world.getEntities(this.source, new AxisAlignedBB((double) i, (double) l, (double) j1, (double) j, (double) i1, (double) k1));
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Fix lag from explosions processing dead entities
|
2019-01-01 03:15:55 +00:00
|
|
|
+ List<Entity> 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>() {
|
2015-06-02 05:56:10 +00:00
|
|
|
+ @Override
|
|
|
|
+ public boolean apply(Entity entity) {
|
2018-09-23 02:28:16 +00:00
|
|
|
+ return IEntitySelector.canAITarget().test(entity) && !entity.dead;
|
2015-06-02 05:56:10 +00:00
|
|
|
+ }
|
|
|
|
+ });
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2015-06-02 05:56:10 +00:00
|
|
|
Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ);
|
|
|
|
|
|
|
|
for (int l1 = 0; l1 < list.size(); ++l1) {
|
2018-09-23 02:28:16 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
|
2020-05-06 09:48:49 +00:00
|
|
|
index c75ed9ddc14e1fd3b57a7c989267bf5a0bb6157a..c1f462d9d3eefdab767bea28da484bfb1dfda06a 100644
|
2018-09-23 02:28:16 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -14,6 +14,7 @@ public final class IEntitySelector {
|
2018-09-23 02:28:16 +00:00
|
|
|
public static final Predicate<Entity> d = (entity) -> {
|
|
|
|
return entity instanceof IInventory && entity.isAlive();
|
|
|
|
};
|
|
|
|
+ public static Predicate<Entity> canAITarget() { return e; } // Paper - OBFHELPER
|
|
|
|
public static final Predicate<Entity> e = (entity) -> {
|
2019-06-03 03:26:25 +00:00
|
|
|
return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative();
|
2018-09-23 02:28:16 +00:00
|
|
|
};
|