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

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-08-01 22:49:47 -04:00
parent 6a48a4529b
commit 1abd4d51c1
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 7b6fefc4f1fbcb78813a93ca4798d0d2e53520bc Mon Sep 17 00:00:00 2001
From 774190c57320a6ef813fa2b05cb4a728f8ff7a2f 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
@@ -29,7 +29,7 @@ index f6beb6886d..d2e87693fa 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 738ac8570c..14a61f68e1 100644
index 015cd553dd..f7588c4d44 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -110,7 +110,7 @@ index 9b1edab77d..8fd7a0d029 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 7bf99cae1b..5ffc4fccd0 100644
index ce8170ea9f..da501a1c5f 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -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 6f1659b221..26b30a1503 100644
index e9707dfa74..a16bfc7f65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -411,8 +411,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -412,8 +412,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public void closeInventory() {