2016-11-17 03:23:38 +01:00
|
|
|
From 991a1ae6922a3bfab70d43eccec3d5843c80088d Mon Sep 17 00:00:00 2001
|
2016-04-28 04:15:57 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 27 Apr 2016 22:09:52 -0400
|
|
|
|
Subject: [PATCH] Improve Minecraft Hopper Performance
|
|
|
|
|
|
|
|
Removes unnecessary extra calls to .update() that are very expensive
|
|
|
|
Also reset cooldown each hopper tick that a hopper is full.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
2016-11-17 03:23:38 +01:00
|
|
|
index 1f3e89b..b2122a9 100644
|
2016-04-28 04:15:57 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
2016-11-17 03:23:38 +01:00
|
|
|
@@ -33,6 +33,7 @@ public abstract class TileEntity {
|
|
|
|
return (MinecraftKey) TileEntity.f.b(oclass);
|
2016-04-28 04:15:57 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ static boolean IGNORE_TILE_UPDATES = false; // Paper
|
|
|
|
public World getWorld() {
|
|
|
|
return this.world;
|
|
|
|
}
|
2016-11-17 03:23:38 +01:00
|
|
|
@@ -111,6 +112,7 @@ public abstract class TileEntity {
|
2016-04-28 04:15:57 +02:00
|
|
|
|
|
|
|
public void update() {
|
|
|
|
if (this.world != null) {
|
|
|
|
+ if (IGNORE_TILE_UPDATES) return; // Paper
|
|
|
|
IBlockData iblockdata = this.world.getType(this.position);
|
|
|
|
|
2016-11-17 03:23:38 +01:00
|
|
|
this.g = iblockdata.getBlock().toLegacyData(iblockdata);
|
2016-04-28 04:15:57 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
2016-11-17 03:23:38 +01:00
|
|
|
index f12bc70..4ebcf47 100644
|
2016-04-28 04:15:57 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
2016-11-17 03:23:38 +01:00
|
|
|
@@ -455,7 +455,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
|
|
|
boolean flag1 = iinventory1.w_();
|
2016-04-28 04:15:57 +02:00
|
|
|
|
2016-11-17 03:23:38 +01:00
|
|
|
if (itemstack1.isEmpty()) {
|
2016-04-28 04:15:57 +02:00
|
|
|
+ IGNORE_TILE_UPDATES = true; // Paper
|
2016-11-17 03:23:38 +01:00
|
|
|
iinventory1.setItem(i, itemstack);
|
2016-04-28 04:15:57 +02:00
|
|
|
+ IGNORE_TILE_UPDATES = false; // Paper
|
2016-11-17 03:23:38 +01:00
|
|
|
itemstack = ItemStack.a;
|
2016-04-28 04:15:57 +02:00
|
|
|
flag = true;
|
|
|
|
} else if (a(itemstack1, itemstack)) {
|
2016-11-17 03:23:38 +01:00
|
|
|
@@ -486,7 +488,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
2016-04-28 04:22:35 +02:00
|
|
|
}
|
|
|
|
}
|
2016-04-28 04:15:57 +02:00
|
|
|
|
2016-11-17 03:23:38 +01:00
|
|
|
- iinventory1.update();
|
|
|
|
+ //iinventory1.update(); // Paper
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -558,6 +560,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
|
|
|
this.f = i;
|
2016-04-28 04:15:57 +02:00
|
|
|
}
|
|
|
|
|
2016-11-17 03:23:38 +01:00
|
|
|
+ boolean isCooledDown() { return J(); } // Paper - OBFHELPER
|
|
|
|
private boolean J() {
|
|
|
|
return this.f > 0;
|
2016-04-28 04:15:57 +02:00
|
|
|
}
|
|
|
|
--
|
2016-11-17 03:23:38 +01:00
|
|
|
2.10.2
|
2016-04-28 04:15:57 +02:00
|
|
|
|