[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
ee12ca7b Add maximum repair cost API to AnvilInventory

CraftBukkit Changes:
1ceee633 Implement maximum repair cost API to AnvilInventory
This commit is contained in:
Automated 2018-10-06 05:31:40 -04:00
parent 114fa519b4
commit 5245154646
4 changed files with 5 additions and 5 deletions

View file

@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
index f2e15fa545..96fcd35bfe 100644
index 4b6424911..5d239322d 100644
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {

View file

@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
Always send current level to the client, and instead make setWindowProperty set the level.
diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
index a8a875fe11..f2e15fa545 100644
index 8731d857b..4b6424911 100644
--- a/src/main/java/net/minecraft/server/ContainerAnvil.java
+++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {
@ -26,7 +26,7 @@ index a8a875fe11..f2e15fa545 100644
this.lastLevelCost = this.levelCost;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1ddbb4329d..a045ec3b22 100644
index 1ddbb4329..a045ec3b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

@ -1 +1 @@
Subproject commit 66b9b8fdd86fe1ef2c7c02ca2316a4025cbfb099
Subproject commit ee12ca7b712793de5356eec6a9162073faae88f8

@ -1 +1 @@
Subproject commit 6a0c4e1cc2518ad246ad51dc9c06412f3c46371f
Subproject commit 1ceee63341927e71e23293be6cb7466bd3045e9e