Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 23ed74032c
commit 48d75228ed
49 changed files with 260 additions and 260 deletions

View File

@@ -1,4 +1,4 @@
From 0afba65cf3655e8488aed1e76126c9ac4fe87b90 Mon Sep 17 00:00:00 2001
From 1aad30bce0b3ac8af14c4d614abcf473189ef3ee 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
@@ -136,10 +136,10 @@ index 45e42e9989..7a2b219c67 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 4b9ecb4a62..b602a5d1b9 100644
index 6f1659b221..26b30a1503 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -402,8 +402,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -411,8 +411,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public void closeInventory() {