Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update Upstream

Browse Source
This commit is contained in:
Spottedleaf
2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0147-Remove-CraftScheduler-Async-Task-Debugger.patch
View File

@@ -1,4 +1,4 @@
From 551d84659a7b941c757445155a784a02238d7122 Mon Sep 17 00:00:00 2001
From d272757d9e21e1082eb9be530126f9f0344a3a74 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 5 Feb 2017 00:04:04 -0500
Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,10 +9,10 @@ One report of a suspected memory leak with the system.
This adds additional overhead to asynchronous task dispatching
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 86a5ee8aa..36eecb670 100644
index 552daf4376..e102be583c 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -411,7 +411,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
}
parsePending();
} else {
@@ -21,7 +21,7 @@ index 86a5ee8aa..36eecb670 100644
executor.execute(new ServerSchedulerReportingWrapper(task)); // Paper
// We don't need to parse pending
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
@@ -428,7 +428,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -431,7 +431,7 @@ public class CraftScheduler implements BukkitScheduler {
pending.addAll(temp);
temp.clear();
MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming();
@@ -30,7 +30,7 @@ index 86a5ee8aa..36eecb670 100644
}
private void addTask(final CraftTask task) {
@@ -488,10 +488,15 @@ public class CraftScheduler implements BukkitScheduler {
@@ -491,10 +491,15 @@ public class CraftScheduler implements BukkitScheduler {
@Override
public String toString() {