aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch')
-rw-r--r--Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
index 8e4e873d7d..6255892ad1 100644
--- a/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
+++ b/Spigot-Server-Patches/0245-InventoryCloseEvent-Reason-API.patch
@@ -1,4 +1,4 @@
-From ab5b9cd90656ebcaabff0c78318838e7b93854ad Mon Sep 17 00:00:00 2001
+From 4e9206e2969755a97beb7e9fdcec406bfbec5208 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ 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/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index e1bd10579e..89915b3599 100644
+index e1bd10579..89915b359 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index e1bd10579e..89915b3599 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 742489d397..7e37164c0e 100644
+index 88bc8b531..1bb580e0e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -64,7 +64,7 @@ index 742489d397..7e37164c0e 100644
}
this.nextContainerCounter();
-@@ -1115,7 +1115,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1118,7 +1118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 742489d397..7e37164c0e 100644
}
// this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1179,7 +1179,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1182,7 +1182,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void closeInventory() {
@@ -88,7 +88,7 @@ index 742489d397..7e37164c0e 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 89beac63aa..b9793d4cc6 100644
+index 89beac63a..b9793d4cc 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2025,7 +2025,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 89beac63aa..b9793d4cc6 100644
this.player.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index a167843bfb..9e5cd22d7d 100644
+index a167843bf..9e5cd22d7 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index a167843bfb..9e5cd22d7d 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cbabe7743d..b67d1b36ea 100644
+index cbabe7743..b67d1b36e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -993,7 +993,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index cbabe7743d..b67d1b36ea 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 77efc43a5d..81cf5f47a7 100644
+index 77efc43a5..81cf5f47a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index 77efc43a5d..81cf5f47a7 100644
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e610c8aaed..ce35e6bbc2 100644
+index e610c8aae..ce35e6bbc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -781,7 +781,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index e610c8aaed..ce35e6bbc2 100644
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8bd1dedcca..ade1d42f7e 100644
+index 8bd1dedcc..ade1d42f7 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1288,8 +1288,19 @@ public class CraftEventFactory {