diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index 42eac76fff..8aeb63d776 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 30eff11643ca14a7af5de155c42d30dff1f5a1bf Mon Sep 17 00:00:00 2001 +From ffc2ee319da1ad8b57a13d9aa0dd8711ce6ee4ad Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index ebcc781c..229fe559 100644 +index 00d8019d9..148c322bc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,38 +3,37 @@ @@ -87,7 +87,7 @@ index ebcc781c..229fe559 100644 org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 - - - eclipse diff --git a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch index 16789a6e37..248f185073 100644 --- a/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0152-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From cb8dd2ae05fdc76057c79ecd8936954fd812a9e1 Mon Sep 17 00:00:00 2001 +From 58185cff7179e9c740a3ec88aa09462e91eeb72b Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,12 +6,12 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index b41e8ffd..e797b060 100644 +index fb82104ba..3df8dc6d4 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java -@@ -39,6 +39,26 @@ public interface Furnace extends Container, Nameable { +@@ -61,6 +61,26 @@ public interface Furnace extends Container, Nameable { */ - public void setCookTime(short cookTime); + public void setCookTimeTotal(int cookTimeTotal); + // Paper start + /** diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index a9dc8b42e1..772c566d1d 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 2a171fc9f9454717a70aa971a34cb26b8e532192 Mon Sep 17 00:00:00 2001 +From ef90bb4bf2978d2ccbf689adb67234a1c9637197 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index 4304b622a..d1913a434 100644 +index b8c0d03fc3..87202a520f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ @@ -138,27 +138,19 @@ index 4304b622a..d1913a434 100644 org.bukkit.craftbukkit org.bukkit.craftbukkit.v${minecraft_version} -@@ -216,18 +208,6 @@ +@@ -216,10 +208,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 - - - eclipse - -- -- -- -- org.codehaus.plexus -- plexus-compiler-eclipse -- 2.8.1-spigotmc -- -- - - - org.apache.maven.plugins + + + diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379d..674096cab 100644 +index 93046379d0..674096cab1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { diff --git a/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch index 915823a0ef..84cc637e40 100644 --- a/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0359-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 8bba4c242ab99b8b0cae9d42487a320af1caac67 Mon Sep 17 00:00:00 2001 +From dd8ac638f61f4aecc7bd3c267ac410dd83d58fbf Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -57,10 +57,10 @@ index 5b6ccfa9f5..bfbd35bbe5 100644 this.cookTimeTotal = this.s(); 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 6ca6a6bf24..cb456f7269 100644 +index c2eea8ce03..429c780ec7 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -@@ -74,4 +74,18 @@ public class CraftFurnace extends CraftContainer implements F +@@ -84,4 +84,18 @@ public class CraftFurnace extends CraftContainer implements F furnace.setCustomName(null); } } diff --git a/work/Bukkit b/work/Bukkit index c64197df52..d38ac1bef4 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit c64197df528c2e6aef9a2404bf24b08a330fefc9 +Subproject commit d38ac1bef469e746c383b1ce8622456e50156640 diff --git a/work/CraftBukkit b/work/CraftBukkit index 1a64d4ae2b..13f71402e8 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 1a64d4ae2b77fe76d4e6d72ce19749fc427804ee +Subproject commit 13f71402e8a26a8beb6f7d4c74cd0985c7a8dbda