Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream S

Browse Source
This commit is contained in:
Zach Brown 2016-10-26 16:05:22 -05:00
parent 3fafa6306a
commit 0860727dae
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0003-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 56bac601f45228492f57f6edd5b4daba183343fc Mon Sep 17 00:00:00 2001 From 3a72f5e0b411d51cf5ec7263a22466214012d08f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600 Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -3278,10 +3278,10 @@ index a8f61f2..0000000
- // Spigot end - // Spigot end
-} -}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9b20d5c..54e8a5c 100644 index 6368f9f..2c6a8f5 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1394,6 +1394,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -1395,6 +1395,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet."); throw new UnsupportedOperationException("Not supported yet.");
} }
@ -3656,5 +3656,5 @@ index 8d98297..7e89b97 100644
- } - }
} }
-- --
2.5.0 2.10.0.windows.1

25
Spigot-API-Patches/0040-Add-debug-logging-to-Timings-enable-setter.patch Normal file
View File

@ -0,0 +1,25 @@
From 582c0de7289fb70e00150ae60d41ec6b7730d1c9 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 26 Oct 2016 15:49:28 -0500
Subject: [PATCH] Add debug logging to Timings enable setter
Potentially temporary, will be merged back into main Timings patch if not.
`java -Dtimings.throwOnChange=true -jar paperclip.jar`
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
index 4e5cf35..bef7cf7 100644
--- a/src/main/java/co/aikar/timings/Timings.java
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -128,6 +128,9 @@ public final class Timings {
public static void setTimingsEnabled(boolean enabled) {
timingsEnabled = enabled;
reset();
+ if (Boolean.getBoolean("timings.throwOnChange")) {
+ new RuntimeException("The enable state of timings has been changed to: " + enabled).printStackTrace();
+ }
}
/**
--
2.10.0.windows.1

2
work/Spigot

@ -1 +1 @@
Subproject commit 850da7e0741c8af9a852d495092dc98249162950 Subproject commit 72c26058df3d4c3a8d2e2b3255d3a032623a01f0