SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add obfuscation helper (aikar's request) (#1468)

Browse Source
This commit is contained in:
BillyGalbreath
2018-09-22 21:28:16 -05:00
parent 1f201ff86c
commit c71f4578ab
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Spigot-Server-Patches/Fix-lag-from-explosions-processing-dead-entities.patch
View File

@@ -5,7 +5,7 @@ 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 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index e5ba6edd..2620c4c2 100644 index e5ba6eddd..c7d11cf62 100644
--- a/src/main/java/net/minecraft/server/Explosion.java --- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -0,0 +0,0 @@ public class Explosion { @@ -0,0 +0,0 @@ public class Explosion {
@@ -17,11 +17,33 @@ index e5ba6edd..2620c4c2 100644
+ 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>() { + 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 + @Override
+ public boolean apply(Entity entity) { + public boolean apply(Entity entity) {
+ return IEntitySelector.e.test(entity) && !entity.dead; + return IEntitySelector.canAITarget().test(entity) && !entity.dead;
+ } + }
+ }); + });
+ // Paper end + // Paper end
Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ); Vec3D vec3d = new Vec3D(this.posX, this.posY, this.posZ);
for (int l1 = 0; l1 < list.size(); ++l1) { for (int l1 = 0; l1 < list.size(); ++l1) {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 30f8ec519..b1d05220b 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -0,0 +0,0 @@ public final class IEntitySelector {
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) -> {
return !(entity instanceof EntityHuman) || !((EntityHuman)entity).isSpectator() && !((EntityHuman)entity).u();
};
@@ -0,0 +0,0 @@ public final class IEntitySelector {
}
}
- // $FF: synthetic method
- public boolean test(@Nullable Object object) {
+ public boolean test(@Nullable Entity object) { // Paper - decompile error
return this.a((Entity)object);
}
}
-- --