core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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:
Aikar 2018-10-06 05:31:40 -04:00
parent addebee995
commit 468a1cbbd7
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0190-Fix-Anvil-Level-sync-to-client.patch
View File

@ -1,4 +1,4 @@
From 979f39c0572758d21860c8724f57f680b4e378c0 Mon Sep 17 00:00:00 2001
From 88c0400ef837ed8809fd5ddf71e58994bdb0a5c0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client
@ -10,10 +10,10 @@ 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
@@ -377,9 +377,9 @@ public class ContainerAnvil extends Container {
@@ -378,9 +378,9 @@ public class ContainerAnvil extends Container {
for (int i = 0; i < this.listeners.size(); ++i) {
ICrafting icrafting = (ICrafting) this.listeners.get(i);
@ -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
@@ -1431,6 +1431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
Spigot-Server-Patches/0315-AnvilDamageEvent.patch
View File

@ -1,14 +1,14 @@
From 95eab5a0a9da4e8d8fea7184768ab9333978d015 Mon Sep 17 00:00:00 2001
From 59fa16a4c0c3b2a2afa3297988aecb9a26c7082c Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 20 Jul 2018 23:37:03 -0500
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
@@ -73,6 +73,16 @@ public class ContainerAnvil extends Container {
@@ -74,6 +74,16 @@ public class ContainerAnvil extends Container {
if (!world.isClientSide) {
if (!entityhuman.abilities.canInstantlyBuild && iblockdata.a(TagsBlock.ANVIL) && entityhuman.getRandom().nextFloat() < 0.12F) {
IBlockData iblockdata1 = BlockAnvil.a_(iblockdata);

2
work/Bukkit

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

2
work/CraftBukkit

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