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

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2018-07-13 02:39:44 -05:00
parent db4ecc9d9d
commit 5b02e5736a
20 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0325-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From 524a2e194ee6786f5eb97bbe758c03816a2abe3f Mon Sep 17 00:00:00 2001
From c5d1182aa2daec8a3627d2295b105756845013b7 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
@@ -110,7 +110,7 @@ index cce3f98da..4ff505cfa 100644
this.r();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4f82d8aae..3f1454ec6 100644
index 36833b961..a54203c56 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1759,7 +1759,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -155,10 +155,10 @@ index d85b5defc..05ca403e8 100644
public boolean isBlocking() {
return getHandle().isBlocking();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fd47065c6..53f973615 100644
index c0f4cec4d..6cbf429ff 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -640,7 +640,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -644,7 +644,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer) {
@@ -193,5 +193,5 @@ index 248873fb4..cce4acc0b 100644
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
}
--
2.17.1
2.18.0