PaperMC/CraftBukkit-Patches/0029-Hopper-Cooldowns.patch

86 lines
4 KiB
Diff
Raw Normal View History

2014-03-26 21:34:47 +01:00
From 58db53f2a0fc9262a36597cb24c19926af8b6cd8 Mon Sep 17 00:00:00 2001
2013-09-09 06:40:16 +02:00
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Cooldowns
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
2014-03-24 21:36:29 +01:00
index 3f1a910..d7a3178 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
2014-03-23 01:06:43 +01:00
@@ -189,12 +189,18 @@ public class TileEntityHopper extends TileEntity implements IHopper {
}
if (flag) {
- this.c(8);
+ this.c(world.spigotConfig.hopperTransfer); // Spigot
this.update();
return true;
}
2013-09-09 06:40:16 +02:00
}
2014-03-23 01:06:43 +01:00
2013-09-09 06:40:16 +02:00
+ // Spigot start
2013-12-01 06:00:50 +01:00
+ if ( !this.j() )
2013-09-09 06:40:16 +02:00
+ {
+ this.c( world.spigotConfig.hopperCheck );
+ }
+ // Spigot end
return false;
} else {
return false;
2014-03-23 01:06:43 +01:00
@@ -260,7 +266,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
this.getWorld().getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
2014-03-24 21:36:29 +01:00
this.setItem(j, itemstack);
2014-03-23 01:06:43 +01:00
- this.c(8); // Delay hopper checks
+ this.c(world.spigotConfig.hopperTransfer); // Spigot
return false;
}
ItemStack itemstack1 = addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), i);
@@ -396,9 +402,9 @@ public class TileEntityHopper extends TileEntity implements IHopper {
iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) {
- ((TileEntityHopper) ihopper).c(8); // Delay hopper checks
+ ((TileEntityHopper) ihopper).c(ihopper.getWorld().spigotConfig.hopperTransfer); // Spigot
} else if (ihopper instanceof EntityMinecartHopper) {
2013-07-02 05:03:56 +02:00
- ((EntityMinecartHopper) ihopper).l(4); // Delay hopper minecart checks
+ ((EntityMinecartHopper) ihopper).l(ihopper.getWorld().spigotConfig.hopperTransfer / 2); // Spigot
}
return false;
2014-03-23 01:06:43 +01:00
@@ -502,7 +508,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
if (flag) {
if (iinventory instanceof TileEntityHopper) {
- ((TileEntityHopper) iinventory).c(8);
+ ((TileEntityHopper) iinventory).c(((TileEntityHopper) iinventory).world.spigotConfig.hopperTransfer); // Spigot
2013-07-02 05:03:56 +02:00
iinventory.update();
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
2014-03-09 23:14:45 +01:00
index 6421bf2..827e6f9 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -164,4 +164,17 @@ public class SpigotWorldConfig
otherTrackingRange = getInt( "entity-tracking-range.other", otherTrackingRange );
log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + otherTrackingRange );
}
+
+ public int hopperTransfer = 8;
2013-09-09 06:40:16 +02:00
+ public int hopperCheck = 8;
+ private void hoppers()
+ {
2013-09-09 06:40:16 +02:00
+ // Set the tick delay between hopper item movements
+ hopperTransfer = getInt( "ticks-per.hopper-transfer", hopperTransfer );
2013-09-09 06:40:16 +02:00
+ // Set the tick delay between checking for items after the associated
+ // container is empty. Default to the hopperTransfer value to prevent
+ // hopper sorting machines from becoming out of sync.
+ hopperCheck = getInt( "ticks-per.hopper-check", hopperTransfer );
+ log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck );
+ }
}
--
2014-03-23 01:06:43 +01:00
1.8.5.2.msysgit.0