diff options
| author | Aikar <[email protected]> | 2020-07-08 19:17:08 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-07-08 19:17:08 -0400 |
| commit | b74fee9e93656aca8f0b8c112b9d464d15c6615f (patch) | |
| tree | 08d35b154bba73fcb2b7cb0bc9f94ec50aa3c473 | |
| parent | 95bd9e04aa81d1b3ff4dfc74aa420596754a47ef (diff) | |
| download | Paper-b74fee9e93656aca8f0b8c112b9d464d15c6615f.tar.gz Paper-b74fee9e93656aca8f0b8c112b9d464d15c6615f.zip | |
[Auto] Updated Upstream (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
CraftBukkit Changes:
72f368909 SPIGOT-5965: BlockRedstoneEvent.setNewCurrent(0) crashes server
60f8a29d1 SPIGOT-5968: Killer rabbits can't be set to the non-killer rabbit behavior
69fddc725 #705: Improve implementation of furnace related block states
| -rw-r--r-- | Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch | 4 | ||||
| m--------- | work/CraftBukkit | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch index 9acaf329a6..a5612b1d3e 100644 --- a/Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0294-Implement-furnace-cook-speed-multiplier-API.patch @@ -57,10 +57,10 @@ index 623cd63711c6cb79dce7a46056e193fdb13334a5..f4f50fb8375fec3f6868bbccc50bc78a this.cookTimeTotal = this.getRecipeCookingTime(); this.burn(irecipe); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -index 9cc67915cacf2920334bc9affede84c786e7172f..1ce10ea049ec86a61bc6179c8606193bc21a7a3f 100644 +index 27c8cc130e7466c396b514dd77f1385f967bebdb..05643f6cd28d22680a18c8b742af8e5e945d1503 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -@@ -63,4 +63,18 @@ public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T> +@@ -63,4 +63,18 @@ public abstract class CraftFurnace<T extends TileEntityFurnace> extends CraftCon public void setCookTimeTotal(int cookTimeTotal) { this.getSnapshot().cookTimeTotal = cookTimeTotal; } diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject f222b5bd4e2552f05029b714729dd97a0af27a3 +Subproject 72f36890922863b9ceea413e9cb34263f2caf66 |