geforkt von Mirrors/Paper
Revert unjustified changes to hopper behaviour.
Dieser Commit ist enthalten in:
Ursprung
faa23b94b0
Commit
102438e3e7
@ -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>
|
||||
Date: Sun, 2 Jun 2013 16:23:46 +1000
|
||||
Subject: [PATCH] Hopper Cooldowns
|
||||
|
||||
|
||||
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
|
||||
+++ 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;
|
||||
if (flag) {
|
||||
@ -17,23 +17,7 @@ index e8cd525..44ddf35 100644
|
||||
this.update();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
-
|
||||
- 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 {
|
||||
@@ -218,7 +218,7 @@ public class TileEntityHopper extends TileEntity implements IHopper {
|
||||
this.getWorld().getServer().getPluginManager().callEvent(event);
|
||||
if (event.isCancelled()) {
|
||||
this.setItem(i, itemstack);
|
||||
@ -42,7 +26,7 @@ index e8cd525..44ddf35 100644
|
||||
return false;
|
||||
}
|
||||
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);
|
||||
|
||||
if (ihopper instanceof TileEntityHopper) {
|
||||
@ -54,7 +38,7 @@ index e8cd525..44ddf35 100644
|
||||
}
|
||||
|
||||
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 (iinventory instanceof TileEntityHopper) {
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren