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

fix "avoid hopper searches" and make it use an obfhelper

Browse Source
This commit is contained in:
Shane Freeder
2018-10-25 21:27:54 +01:00
parent 66c2497101
commit e4a5ddd929
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/Avoid-hopper-searches-if-there-are-no-items.patch
View File

@@ -63,7 +63,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
+ * Make sure the inventory selector stays in sync. + * Make sure the inventory selector stays in sync.
+ * It should be the one that checks `var1 instanceof IInventory && var1.isAlive()` + * It should be the one that checks `var1 instanceof IInventory && var1.isAlive()`
+ */ + */
+ if (predicate == IEntitySelector.c && inventoryEntityCounts[k] <= 0) continue; + if (predicate == IEntitySelector.isInventory() && inventoryEntityCounts[k] <= 0) continue;
+ // Paper end + // Paper end
while (iterator.hasNext()) { while (iterator.hasNext()) {
Entity entity1 = (Entity) iterator.next(); Entity entity1 = (Entity) iterator.next();
@@ -87,4 +87,16 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
Iterator iterator = this.entitySlices[k].iterator(); // Spigot Iterator iterator = this.entitySlices[k].iterator(); // Spigot
while (iterator.hasNext()) { while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 7ac07ac07ac0..7ac07ac07ac0 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> c = (entity) -> {
return entity.isAlive() && !entity.isVehicle() && !entity.isPassenger();
};
+ public static final Predicate<Entity> isInventory() { return d; } // Paper - OBFHELPER
public static final Predicate<Entity> d = (entity) -> {
return entity instanceof IInventory && entity.isAlive();
};
-- --