Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream CB

Browse Source 
--- work/CraftBukkit
Submodule work/CraftBukkit a2dd0e303..51c118b1d:
  > SPIGOT-4619: Incorrect packet order for villager inventories
  > Fix EntityPickupItemEvent getRemaining / PlayerInventory#canHold
This commit is contained in:
Zach Brown
2019-02-13 09:07:12 -05:00
parent 60d222d330
commit 0ecc1545dd
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0280-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From be44a8f7dca619d2ee1b614d648bf2bbb935f0fb Mon Sep 17 00:00:00 2001
From c80cb650d92bb7c8994aa0edc393a2a48302402c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -56,7 +56,7 @@ index e06f03e80..59f108e49 100644
this.activeContainer = this.defaultContainer;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index cd488d37f..1054367d0 100644
index 55f4ab93e..13409c041 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -344,7 +344,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -86,7 +86,7 @@ index cd488d37f..1054367d0 100644
}
if (iinventory instanceof ITileInventory) {
@@ -933,7 +933,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -940,7 +940,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@@ -95,7 +95,7 @@ index cd488d37f..1054367d0 100644
}
this.nextContainerCounter();
@@ -998,7 +998,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1005,7 +1005,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void closeInventory() {