mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
From d7d65dc85cb3518324f27df6192d707fd664d562 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
|
|
|
|
https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/763827668e6e5cddc111f3c93a0d718fec21ff51
|
|
|
|
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 229f4f8829..fb3413d81e 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 {
|
|
for (int i = 0; i < this.listeners.size(); ++i) {
|
|
ICrafting icrafting = (ICrafting) this.listeners.get(i);
|
|
|
|
- if (this.lastLevelCost != this.levelCost) {
|
|
+ //if (this.lastLevelCost != this.levelCost) { // Paper - this was the wrong solution to this, fixing it correctly in CraftPlayer
|
|
icrafting.setContainerData(this, 0, this.levelCost);
|
|
- }
|
|
+ //} // Paper
|
|
}
|
|
|
|
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 63341ec778..bf7bfb427b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1420,6 +1420,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
if (container.getBukkitView().getType() != prop.getType()) {
|
|
return false;
|
|
}
|
|
+ // Paper start
|
|
+ if (prop == Property.REPAIR_COST && container instanceof net.minecraft.server.ContainerAnvil) {
|
|
+ ((net.minecraft.server.ContainerAnvil) container).levelCost = value;
|
|
+ }
|
|
+ // Paper end
|
|
getHandle().setContainerData(container, prop.getId(), value);
|
|
return true;
|
|
}
|
|
--
|
|
2.18.0
|
|
|