Relocate Timings v2 patch
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
From 2913f79fb789598971e82b36b116972502375d43 Mon Sep 17 00:00:00 2001
|
||||
From 115a69756eb8f99a16be4b602e75edce84128684 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 18:48:17 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 2e8b318..3be5e5b 100644
|
||||
index d916f44..d3a877a 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -1,4 +1,3 @@
|
||||
@@ -1506,7 +1506,7 @@ index 0000000..3dba3aa
|
||||
+}
|
||||
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
new file mode 100644
|
||||
index 0000000..fe19ea0
|
||||
index 0000000..09cab70
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
|
||||
@@ -0,0 +1,373 @@
|
||||
@@ -2783,7 +2783,7 @@ index 0000000..3a288d2
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index e19f3d7..8d602a3 100644
|
||||
index dc2c9d1..85fd9a8 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -537,7 +537,6 @@ public final class Bukkit {
|
||||
@@ -2795,10 +2795,10 @@ index e19f3d7..8d602a3 100644
|
||||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 92a5cbc..86fe389 100644
|
||||
index 69720e9..f82cbaf 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -949,12 +949,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -942,12 +942,27 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
||||
public class Spigot
|
||||
{
|
||||
@@ -3160,10 +3160,10 @@ index fc59aa3..0000000
|
||||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index ed8b8f1..855bde5 100644
|
||||
index 649cd45..3242c69 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1384,6 +1384,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -1356,6 +1356,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
|
||||
throw new UnsupportedOperationException("Not supported yet.");
|
||||
}
|
||||
@@ -3538,5 +3538,5 @@ index 8d98297..7e89b97 100644
|
||||
- }
|
||||
}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
From 9a4a2c1714d36269d90b39931fbc0209bacc9194 Mon Sep 17 00:00:00 2001
|
||||
From 5ae17d42515dab32a03341740fd3b99aeb4c4420 Mon Sep 17 00:00:00 2001
|
||||
From: Jedediah Smith <jedediah@silencegreys.com>
|
||||
Date: Mon, 29 Feb 2016 17:22:34 -0600
|
||||
Subject: [PATCH] Player affects spawning API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index dc58bea..2721f4c 100644
|
||||
index 3242c69..0979f94 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1270,6 +1270,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -30,5 +30,5 @@ index dc58bea..2721f4c 100644
|
||||
public class Spigot extends Entity.Spigot
|
||||
{
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
From 9082960948db00f8186644598d78836679ac08cf Mon Sep 17 00:00:00 2001
|
||||
From c84a859dcf623824d3fa4f45d0fdb00c96f791a3 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 17:24:57 -0600
|
||||
Subject: [PATCH] Add getTPS method
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index dc2c9d1..e19f3d7 100644
|
||||
index 85fd9a8..8d602a3 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -1141,6 +1141,14 @@ public final class Bukkit {
|
||||
@@ -1140,6 +1140,14 @@ public final class Bukkit {
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -24,7 +24,7 @@ index dc2c9d1..e19f3d7 100644
|
||||
* @return the unsafe values instance
|
||||
*/
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 69720e9..92a5cbc 100644
|
||||
index f82cbaf..6e23b0c 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient {
|
||||
@@ -42,5 +42,5 @@ index 69720e9..92a5cbc 100644
|
||||
* @return the unsafe values instance
|
||||
*/
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
From 71adf6472ca1b721a50a1258ae05839fe735e00d Mon Sep 17 00:00:00 2001
|
||||
From 185a0dc471a2a1f5c74365f576ef3fecc04077cf Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 29 Feb 2016 17:43:33 -0600
|
||||
Subject: [PATCH] Add async chunk load API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 4125633..724d7a9 100644
|
||||
index d088c3c..d16facb 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -130,6 +130,78 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -88,5 +88,5 @@ index 4125633..724d7a9 100644
|
||||
*
|
||||
* @param chunk The chunk to check
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a1986bb1ab9932a428e2e58202ee90900c09e620 Mon Sep 17 00:00:00 2001
|
||||
From 77c518b68d30af9a16dee08c8352fdeb2c9ad371 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 17:50:31 -0600
|
||||
Subject: [PATCH] FallingBlock and TNTPrimed source location API
|
||||
@@ -37,5 +37,5 @@ index 3ce322d..74b82f9 100644
|
||||
+ public org.bukkit.Location getSourceLoc();
|
||||
}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From a70062b4b5381c43c226ced8ae82eec0bed1843a Mon Sep 17 00:00:00 2001
|
||||
From 8945fdcb9e256a858154ee2bd510b0be242c9258 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Mon, 29 Feb 2016 17:58:01 -0600
|
||||
Subject: [PATCH] Check Paper versions
|
||||
@@ -139,5 +139,5 @@ index b55abdb..6d32e1d 100644
|
||||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 84ef6c67c70f704918f2d6d1ae00a1ae10b317be Mon Sep 17 00:00:00 2001
|
||||
From bb0becc6c80fa0996078cc9e7d5bb3e0dea72611 Mon Sep 17 00:00:00 2001
|
||||
From: Isaac Moore <rmsy@me.com>
|
||||
Date: Mon, 29 Feb 2016 18:02:25 -0600
|
||||
Subject: [PATCH] Add PlayerLocaleChangeEvent
|
||||
@@ -58,5 +58,5 @@ index 0000000..17afc8c
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
From 43f1261cbeab869585712a558a8a333b7a316348 Mon Sep 17 00:00:00 2001
|
||||
From a4a5ff9f015a914a3967d0392769a74190945cba Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 18:05:37 -0600
|
||||
Subject: [PATCH] Add player view distance API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 2721f4c..ed8b8f1 100644
|
||||
index 0979f94..1a11c2b 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -1284,6 +1284,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -30,5 +30,5 @@ index 2721f4c..ed8b8f1 100644
|
||||
public class Spigot extends Entity.Spigot
|
||||
{
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 9070ef66368a21f22fca497c89a62e1dacded81a Mon Sep 17 00:00:00 2001
|
||||
From dcd1942fd0c3527281f9411bd7c4103ebdf00f1e Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Mon, 29 Feb 2016 18:09:40 -0600
|
||||
Subject: [PATCH] Add BeaconEffectEvent
|
||||
@@ -92,5 +92,5 @@ index 0000000..6579ae9
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 0bae0f2147779322e69049cf9514e97f2b346a0e Mon Sep 17 00:00:00 2001
|
||||
From 3eba221a754f0bdf4bc31cc105ed33757d4ab7f0 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Anton <anxuiz.nx@gmail.com>
|
||||
Date: Mon, 29 Feb 2016 18:13:58 -0600
|
||||
Subject: [PATCH] Add PlayerInitialSpawnEvent
|
||||
@@ -55,5 +55,5 @@ index 0000000..d1d6f33
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.7.2
|
||||
2.7.1.windows.2
|
||||
|
||||
Reference in New Issue
Block a user