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

Push based hoppers cleanup

This commit is contained in:
Zach Brown 2016-07-22 18:54:48 -05:00
parent 9918f90710
commit 56d669ca52
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Spigot-Server-Patches/0158-Make-entities-look-for-hoppers.patch
View File

@ -1,4 +1,4 @@
From 383580daebc049ec250ab08834a38b4a99be07f6 Mon Sep 17 00:00:00 2001 From c4306f7afe0f8ac12e6a8ab50bc198532fbdef1c Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500 Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers Subject: [PATCH] Make entities look for hoppers
@ -14,7 +14,7 @@ This patch may causes a decrease in the performance of dropped items, which is w
diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java diff --git a/src/main/java/com/destroystokyo/paper/HopperPusher.java b/src/main/java/com/destroystokyo/paper/HopperPusher.java
new file mode 100644 new file mode 100644
index 0000000..5ff43e2 index 0000000..aef7c2b
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java +++ b/src/main/java/com/destroystokyo/paper/HopperPusher.java
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -49,7 +49,7 @@ index 0000000..5ff43e2
+ * This operation doesn't work both ways! + * This operation doesn't work both ways!
+ * Make sure you check if the entity's box intersects the hopper's box, not vice versa! + * Make sure you check if the entity's box intersects the hopper's box, not vice versa!
+ */ + */
+ if (this.getBoundingBox().b(hopperBoundingBox)) { + if (this.getBoundingBox().intersects(hopperBoundingBox)) {
+ return hopper; + return hopper;
+ } + }
+ } + }
@ -91,6 +91,18 @@ index cc5e299..b811775 100644
+ isHopperPushBased = getBoolean("hopper.push-based", true); + isHopperPushBased = getBoolean("hopper.push-based", true);
+ } + }
} }
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index 8c64279..39e63be 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -191,6 +191,7 @@ public class AxisAlignedBB {
}
}
+ public final boolean intersects(AxisAlignedBB intersecting) { return this.b(intersecting); }
public boolean b(AxisAlignedBB axisalignedbb) {
return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f);
}
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index d6cc51b..5bbaa87 100644 index d6cc51b..5bbaa87 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java --- a/src/main/java/net/minecraft/server/BlockPosition.java
@ -237,7 +249,7 @@ index 804215a..e830d83 100644
+ double G(); default double getZ() { return G(); } // Paper - OBFHELPER + double G(); default double getZ() { return G(); } // Paper - OBFHELPER
} }
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 0d521ca..40cb778 100644 index 0d521ca..54413cd 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
@@ -170,6 +170,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi @@ -170,6 +170,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -261,7 +273,7 @@ index 0d521ca..40cb778 100644
} }
+ // Paper start + // Paper start
+ private boolean mayAcceptItems = true; + private boolean mayAcceptItems = false;
+ +
+ public boolean canAcceptItems() { + public boolean canAcceptItems() {
+ return mayAcceptItems; + return mayAcceptItems;
@ -307,7 +319,7 @@ index 0d521ca..40cb778 100644
+ // Paper start - don't search for entities in push mode + // Paper start - don't search for entities in push mode
+ World world = getWorld(); + World world = getWorld();
+ return getInventory(world, this.E() + (double) enumdirection.getAdjacentX(), this.F() + (double) enumdirection.getAdjacentY(), this.G() + (double) enumdirection.getAdjacentZ(), !world.paperConfig.isHopperPushBased); + return getInventory(world, this.E() + (double) enumdirection.getAdjacentX(), this.F() + (double) enumdirection.getAdjacentY(), this.G() + (double) enumdirection.getAdjacentZ(), !world.paperConfig.isHopperPushBased);
+ // Paper endtcon + // Paper end
} }
- public static IInventory b(IHopper ihopper) { - public static IInventory b(IHopper ihopper) {
@ -358,5 +370,5 @@ index 0d521ca..40cb778 100644
if (!list.isEmpty()) { if (!list.isEmpty()) {
-- --
2.9.0 2.9.2.windows.1

1
scripts/importmcdev.sh
View File

@ -35,6 +35,7 @@ function import {
fi fi
) )
import AxisAlignedBB
import BaseBlockPosition import BaseBlockPosition
import BiomeBase import BiomeBase
import BiomeMesa import BiomeMesa