mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-08 11:50:32 +01:00
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From cabf4d121a1c5db55fe69b58015d9f62232a9e29 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 9fa93ed..cd39fe5 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;
|
|
}
|
|
@@ -113,6 +114,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 d1ce2b9..a651961 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
|
|
@@ -188,6 +188,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
|
return true;
|
|
}
|
|
}
|
|
+
|
|
return false;
|
|
} else {
|
|
return false;
|
|
@@ -499,7 +500,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)) {
|
|
@@ -519,7 +522,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
|
|
tileentityhopper.setCooldown(tileentityhopper.world.spigotConfig.hopperTransfer); // Spigot
|
|
}
|
|
|
|
- iinventory.update();
|
|
+ //iinventory.update(); // Paper
|
|
}
|
|
|
|
iinventory.update();
|
|
@@ -594,6 +597,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.9.2.windows.1
|
|
|