spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2018-11-19 22:04:27 +11:00
parent 5696c83c1a
commit 9b4b0a2184
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CraftBukkit-Patches/0021-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 04e0cce58ba6143eafc712dd00c806e6b375e3b2 Mon Sep 17 00:00:00 2001
From daeb7b24b0b54b60dd33d3f5db994bac32786aec Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -6,7 +6,7 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index 49f845051..b0e7c4c0e 100644
index d27a93cb2..26a731680 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -115,9 +115,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@ -53,9 +53,9 @@ index 49f845051..b0e7c4c0e 100644
}
+ int origCount = event.getItem().getAmount(); // Spigot
ItemStack itemstack1 = addItem(this, iinventory, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
// CraftBukkit end
if (itemstack1.isEmpty()) {
@@ -231,6 +237,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -227,6 +233,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return true;
}
@ -63,7 +63,7 @@ index 49f845051..b0e7c4c0e 100644
this.setItem(i, itemstack);
}
}
@@ -351,7 +358,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -347,7 +354,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
ItemStack itemstack1 = itemstack.cloneItemStack();
// ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
// CraftBukkit start - Call event on collection of items from inventories into the hopper
@ -72,7 +72,7 @@ index 49f845051..b0e7c4c0e 100644
Inventory sourceInventory;
// Have to special case large chests as they work oddly
@@ -368,13 +375,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -364,13 +371,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) {
@ -87,9 +87,9 @@ index 49f845051..b0e7c4c0e 100644
}
+ int origCount = event.getItem().getAmount(); // Spigot
ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
// CraftBukkit end
if (itemstack2.isEmpty()) {
@@ -387,6 +394,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -379,6 +386,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
return true;
}
@ -97,7 +97,7 @@ index 49f845051..b0e7c4c0e 100644
iinventory.setItem(i, itemstack1);
}
@@ -477,7 +485,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -469,7 +477,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
}
}

6
CraftBukkit-Patches/0064-Prevent-hoppers-from-loading-chunks.patch
View file

@ -1,14 +1,14 @@
From a02add5d8c8650e96ccf4897e011fc1579480a1e Mon Sep 17 00:00:00 2001
From ed3e1355f9720a53641cc7180279d768884e03e0 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 5 Mar 2014 20:27:27 +0000
Subject: [PATCH] Prevent hoppers from loading chunks
diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
index b0e7c4c0e..5ba009c7c 100644
index 26a731680..b36ec46bf 100644
--- a/src/main/java/net/minecraft/server/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
@@ -523,6 +523,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -515,6 +515,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
public static IInventory a(World world, double d0, double d1, double d2) {
Object object = null;
BlockPosition blockposition = new BlockPosition(d0, d1, d2);