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

Compile fixes (#2732)

Browse Source
This commit is contained in:
MiniDigger
2019-12-12 19:45:00 +01:00
committed by Shane Freeder
parent 44d032f1e9
commit d8a0622602
28 changed files with 155 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From 792aa8e22f2ae684c1c8e27c50142a186d44f4c4 Mon Sep 17 00:00:00 2001
From f25751b7d11157ad17eab03837a8fecec84c83a0 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
@@ -34,7 +34,7 @@ index 3917980b7..007934d8c 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 4e6601617..bb2a0b7e6 100644
index 6443e68f4..850c7cc1b 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 {
@@ -55,7 +55,7 @@ index 4e6601617..bb2a0b7e6 100644
}
String deathMessage = event.getDeathMessage();
@@ -1027,7 +1027,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1026,7 +1026,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return OptionalInt.empty();
} else {
if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index 4e6601617..bb2a0b7e6 100644
}
this.nextContainerCounter();
@@ -1087,7 +1087,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1086,7 +1086,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
// CraftBukkit end
if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 4e6601617..bb2a0b7e6 100644
}
// this.nextContainerCounter(); // CraftBukkit - moved up
@@ -1151,7 +1151,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1150,7 +1150,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void closeInventory() {
@@ -155,7 +155,7 @@ index cd8ad2704..e169679c8 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 4dc79ca4e..e45dd6cd4 100644
index b3a2b7fea..61dbb31e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -780,7 +780,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -193,5 +193,5 @@ index 94fbac5e4..7967222d9 100644
human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
}
--
2.24.1
2.17.1