Merge pull request #519 from jamierocks/pr/update-inv

Update inventory. Fixes #505
This commit is contained in:
Zach 2016-11-28 15:42:12 -06:00 committed by GitHub
commit 422dd712f9

View file

@ -1,4 +1,4 @@
From 991a1ae6922a3bfab70d43eccec3d5843c80088d Mon Sep 17 00:00:00 2001 From 0eaf3ca3298bb5c9a52c60b66f6d250e6797fa95 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 27 Apr 2016 22:09:52 -0400 Date: Wed, 27 Apr 2016 22:09:52 -0400
Subject: [PATCH] Improve Minecraft Hopper Performance Subject: [PATCH] Improve Minecraft Hopper Performance
@ -27,7 +27,7 @@ index 1f3e89b..b2122a9 100644
this.g = iblockdata.getBlock().toLegacyData(iblockdata); this.g = iblockdata.getBlock().toLegacyData(iblockdata);
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index f12bc70..4ebcf47 100644 index f12bc70..7154776 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -455,7 +455,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -455,7 +455,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -40,15 +40,6 @@ index f12bc70..4ebcf47 100644
itemstack = ItemStack.a; itemstack = ItemStack.a;
flag = true; flag = true;
} else if (a(itemstack1, itemstack)) { } else if (a(itemstack1, itemstack)) {
@@ -486,7 +488,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
}
}
- iinventory1.update();
+ //iinventory1.update(); // Paper
}
}
@@ -558,6 +560,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -558,6 +560,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
this.f = i; this.f = i;
} }
@ -58,5 +49,5 @@ index f12bc70..4ebcf47 100644
return this.f > 0; return this.f > 0;
} }
-- --
2.10.2 2.10.0