twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 03:35:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
nms-patches/TileEntityHopper.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/TileEntityHopper.java
+++ b/net/minecraft/server/TileEntityHopper.java
@@ -4,12 +4,46 @@
import java.util.List;
@@ -7,12 +7,46 @@
import java.util.stream.Collectors;
import javax.annotation.Nullable;
+// CraftBukkit start
@@ -17,7 +17,7 @@
private NonNullList<ItemStack> items;
private int f;
private long g;
private long j;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
@@ -45,8 +45,8 @@
+ // CraftBukkit end
+
public TileEntityHopper() {
super(TileEntityTypes.r);
this.items = NonNullList.a(5, ItemStack.a);
this.f = -1;
@@ -72,7 +106,7 @@
}
@@ -55,8 +55,8 @@
+ return maxStack; // CraftBukkit
}
public void e() {
@@ -163,10 +197,35 @@
public void X_() {
@@ -165,10 +199,35 @@
for (int i = 0; i < this.getSize(); ++i) {
if (!this.getItem(i).isEmpty()) {
ItemStack itemstack = this.getItem(i).cloneItemStack();
@@ -94,7 +94,7 @@
return true;
}
@@ -288,10 +347,41 @@
@@ -290,10 +349,41 @@
if (!itemstack.isEmpty() && b(iinventory, itemstack, i, enumdirection)) {
ItemStack itemstack1 = itemstack.cloneItemStack();
@@ -138,17 +138,17 @@
return true;
}
@@ -307,6 +397,13 @@
if (entityitem == null) {
return false;
} else {
+ // CraftBukkit start
+ InventoryPickupItemEvent event = new InventoryPickupItemEvent(iinventory1.getOwner().getInventory(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
+ entityitem.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return false;
+ }
+ // CraftBukkit end
ItemStack itemstack = entityitem.getItemStack().cloneItemStack();
ItemStack itemstack1 = addItem(iinventory, iinventory1, itemstack, (EnumDirection) null);
@@ -305,6 +395,13 @@
public static boolean a(IInventory iinventory, EntityItem entityitem) {
boolean flag = false;
+ // CraftBukkit start
+ InventoryPickupItemEvent event = new InventoryPickupItemEvent(iinventory.getOwner().getInventory(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
+ entityitem.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return false;
+ }
+ // CraftBukkit end
ItemStack itemstack = entityitem.getItemStack().cloneItemStack();
ItemStack itemstack1 = addItem((IInventory) null, iinventory, itemstack, (EnumDirection) null);