twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update CB/S

Browse Source
This commit is contained in:
Shane Freeder
2018-03-31 10:34:25 +01:00
parent 99efa104db
commit 1872a94c83
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -1062,7 +1062,7 @@ index f74b06794..1fc632e0c 100644
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 6d27860cd..0fc37a095 100644
index d4acbed0c..1d9f3e3dd 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -0,0 +0,0 @@
@@ -1674,7 +1674,7 @@ index 2d5dc2179..916781403 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 23d7ce26f..d50bbd2a6 100644
index 71ee1fdd5..e149dbf62 100644
--- a/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;
@@ -1691,7 +1691,7 @@ index 23d7ce26f..d50bbd2a6 100644
return false;
- }});
+ }}){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
handle(task, 0l);
handle(task, 0L);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
@@ -1700,7 +1700,7 @@ index 23d7ce26f..d50bbd2a6 100644
}
- });
+ }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper
handle(task, 0l);
handle(task, 0L);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
@@ -1709,7 +1709,7 @@ index 23d7ce26f..d50bbd2a6 100644
}
- });
+ }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
handle(task, 0l);
handle(task, 0L);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
@@ -1750,7 +1750,7 @@ index 23d7ce26f..d50bbd2a6 100644
private boolean isReady(final int currentTick) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index c37275f2a..a03f933af 100644
index 7e7ce9a81..46029ce24 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -0,0 +0,0 @@
@@ -1776,10 +1776,10 @@ index c37275f2a..a03f933af 100644
- final CustomTimingsHandler timings; // Spigot
CraftTask() {
this(null, null, -1, -1);
this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
}
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this(null, task, -1, -1);
this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
}
- // Spigot start
@@ -1818,7 +1818,7 @@ index c37275f2a..a03f933af 100644
long getPeriod() {
@@ -0,0 +0,0 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
setPeriod(-2l);
setPeriod(CraftTask.CANCEL);
return true;
}
-