SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Upstream

Browse Source
This commit is contained in:
Aikar
2018-06-20 23:29:33 -04:00
parent 899149d68d
commit 34c2733939
7 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 71ee1fdd5..e149dbf62 100644
index f11bd7545..93b9134d6 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;
@@ -1713,8 +1713,8 @@ index 71ee1fdd5..e149dbf62 100644
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -0,0 +0,0 @@ public class CraftScheduler implements BukkitScheduler {
}
if (task.isSync()) {
currentTask = task;
try {
- task.timings.startTiming(); // Spigot
task.run();