mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-07 07:32:03 -07:00
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6222)
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:
@@ -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;
|
||||||
|
@@ -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() {
|
||||||
|
@@ -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);
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
|
Submodule work/Bukkit updated: 5662c2b305...eec4aab001
Submodule work/CraftBukkit updated: 4e1870454c...b8c522d56d
Submodule work/Spigot updated: 38e6c03da1...d03d7f12a4
Reference in New Issue
Block a user