core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert unjustified changes to hopper behaviour.

This commit is contained in:
md_5 2013-08-25 12:22:37 +10:00
parent faa23b94b0
commit 102438e3e7
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CraftBukkit-Patches/0040-Hopper-Cooldowns.patch
View File

@ -1,14 +1,14 @@
From 1c9eb2932f5d4eb8287ee104d53edc1eb8368da3 Mon Sep 17 00:00:00 2001 From 64b8ebe5748932487931eafeec0a8c9b13ff2454 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de> From: DerFlash <bte@freenet.de>
Date: Sun, 2 Jun 2013 16:23:46 +1000 Date: Sun, 2 Jun 2013 16:23:46 +1000
Subject: [PATCH] Hopper Cooldowns Subject: [PATCH] Hopper Cooldowns
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 e8cd525..44ddf35 100644 index e8cd525..d406fbd 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
@@ -182,16 +182,19 @@ public class TileEntityHopper extends TileEntity implements IHopper { @@ -182,7 +182,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
flag = suckInItems(this) || flag; flag = suckInItems(this) || flag;
if (flag) { if (flag) {
@ -17,23 +17,7 @@ index e8cd525..44ddf35 100644
this.update(); this.update();
return true; return true;
} }
} @@ -218,7 +218,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
-
- return false;
- } else {
- return false;
}
+ // Spigot start
+ if ( this.c == 0 )
+ {
+ this.c( world.spigotConfig.hopperCheck );
+ }
+ // Spigot end
+ return false;
}
private boolean u() {
@@ -218,7 +221,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
this.getWorld().getServer().getPluginManager().callEvent(event); this.getWorld().getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
this.setItem(i, itemstack); this.setItem(i, itemstack);
@ -42,7 +26,7 @@ index e8cd525..44ddf35 100644
return false; return false;
} }
ItemStack itemstack1 = addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), Facing.OPPOSITE_FACING[BlockHopper.c(this.p())]); ItemStack itemstack1 = addItem(iinventory, CraftItemStack.asNMSCopy(event.getItem()), Facing.OPPOSITE_FACING[BlockHopper.c(this.p())]);
@@ -299,9 +302,9 @@ public class TileEntityHopper extends TileEntity implements IHopper { @@ -299,9 +299,9 @@ public class TileEntityHopper extends TileEntity implements IHopper {
iinventory.setItem(i, itemstack1); iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) { if (ihopper instanceof TileEntityHopper) {
@ -54,7 +38,7 @@ index e8cd525..44ddf35 100644
} }
return false; return false;
@@ -405,7 +408,7 @@ public class TileEntityHopper extends TileEntity implements IHopper { @@ -405,7 +405,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
if (flag) { if (flag) {
if (iinventory instanceof TileEntityHopper) { if (iinventory instanceof TileEntityHopper) {