OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)

Browse source 
Upstream has released updates that appear 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:
eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron

CraftBukkit Changes:
b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent
f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron
d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket
4f34a67b #891: Fix scheduler task ID overflow and duplication issues

Spigot Changes:
d03d7f12 BUILDTOOLS-604: Rebuild patches
This commit is contained in:
Jason Penilla 2021-07-18 00:41:53 -07:00
parent 039952aa5e
commit 3626a2c62b
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/Add-exception-reporting-event.patch
View file

@ -226,9 +226,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.IntUnaryOperator;
import java.util.logging.Level; import java.util.logging.Level;
+import com.destroystokyo.paper.ServerSchedulerReportingWrapper; +import com.destroystokyo.paper.ServerSchedulerReportingWrapper;
+import com.destroystokyo.paper.event.server.ServerExceptionEvent; +import com.destroystokyo.paper.event.server.ServerExceptionEvent;

2
patches/server/Improved-Async-Task-Scheduler.patch
View file

@ -349,7 +349,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.addTask(task); this.addTask(task);
return task; return task;
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler { @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
return this.ids.incrementAndGet(); return id;
} }
- private void parsePending() { - private void parsePending() {

2
patches/server/MC-Utils.patch
View file

@ -4047,7 +4047,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ static Plugin MINECRAFT = new MinecraftInternalPlugin(); + static Plugin MINECRAFT = new MinecraftInternalPlugin();
/** /**
* Counter for IDs. Order doesn't matter, only uniqueness. * The start ID for the counter.
*/ */
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler { @@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
this.runTaskTimer(plugin, (Object) task, delay, period); this.runTaskTimer(plugin, (Object) task, delay, period);

3
patches/server/Timings-v2.patch
View file

@ -2148,6 +2148,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public Timing timings; // Paper + public Timing timings; // Paper
private final Plugin plugin; private final Plugin plugin;
private final int id; private final int id;
private final long createdAt = System.nanoTime();
- final CustomTimingsHandler timings; // Spigot - final CustomTimingsHandler timings; // Spigot
CraftTask() { CraftTask() {
@ -2184,7 +2185,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } // Paper + } // Paper
} }
long getPeriod() { long getCreatedAt() {
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this.next = next; this.next = next;
} }

2
work/Bukkit

@ -1 +1 @@
Subproject commit 5662c2b3053b90258e479097bd68d21236018b1d Subproject commit eec4aab0016f14b085a3a1d573266d6b7b4a0146

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4e1870454ce16c8e6dcd761c23bd7aec6a59a879 Subproject commit b8c522d56d159fb9b7a291f1f7973e67fb41ea66

2
work/Spigot

@ -1 +1 @@
Subproject commit 38e6c03da15d7fc0d08e5ab9b09d3e0acdd470e3 Subproject commit d03d7f12a440519dd6f4d1491af3a7988a56b5c0