From aa73526a81df5b7120cf6c8384b7a5840c46e00d Mon Sep 17 00:00:00 2001 From: Aikar 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 index f579d28..6962c1b 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -36,6 +36,7 @@ public abstract class TileEntity { } } + static boolean IGNORE_TILE_UPDATES = false; // Paper public World getWorld() { return this.world; } @@ -105,6 +106,7 @@ public abstract class TileEntity { public void update() { if (this.world != null) { + if (IGNORE_TILE_UPDATES) return; // Paper IBlockData iblockdata = this.world.getType(this.position); this.h = iblockdata.getBlock().toLegacyData(iblockdata); diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java index 243da36..68d096f 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -185,12 +185,15 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi } // Paper end } + + if (!isCooledDown() && isFull()) { setCooldown(world.spigotConfig.hopperTransfer); } // Paper return false; } else { return false; } } + boolean isFull() { return q(); } // Paper // OBFHELPER private boolean q() { ItemStack[] aitemstack = this.items; int i = aitemstack.length; @@ -485,7 +488,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi boolean flag = false; if (itemstack1 == null) { + IGNORE_TILE_UPDATES = true; // Paper iinventory.setItem(i, itemstack); + IGNORE_TILE_UPDATES = false; // Paper itemstack = null; flag = true; } else if (a(itemstack1, itemstack)) { @@ -505,7 +510,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi tileentityhopper.setCooldown(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot } - iinventory.update(); + //iinventory.update(); // Paper } iinventory.update(); @@ -580,6 +585,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi this.g = i; } + boolean isCooledDown() { return o(); } // Paper // OBFHELPER public boolean o() { return this.g > 0; } -- 2.8.1