Update upstream

This commit is contained in:
Aikar
2018-07-22 13:10:15 -04:00
parent c025f19c31
commit 4b66f1978d
10 changed files with 33 additions and 33 deletions

View File

@@ -1,4 +1,4 @@
From a110ff1f46dcdda93c0d692af44fd4d36b0dbc26 Mon Sep 17 00:00:00 2001
From bb581a508ed49e47db77cfe8cd9a3fb642b03acc 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
@@ -7,10 +7,10 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index a5a63a01d..e504b7858 100644
index 7a797bef0..7a7d65692 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -886,7 +886,7 @@ public class Chunk implements IChunkAccess {
@@ -883,7 +883,7 @@ public class Chunk implements IChunkAccess {
{
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
{
@@ -19,7 +19,7 @@ index a5a63a01d..e504b7858 100644
}
}
}
@@ -911,7 +911,7 @@ public class Chunk implements IChunkAccess {
@@ -908,7 +908,7 @@ public class Chunk implements IChunkAccess {
{
if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
{