Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose internal current tick

Browse Source
This commit is contained in:
William Blake Galbreath
2019-09-01 17:22:55 -05:00
parent 57951818ee
commit baaba9c765
2 changed files with 85 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
patches/api/0015-Expose-internal-current-tick.patch Normal file
View File

@@ -0,0 +1,50 @@
From b4d42587db5f3fbd98fc5b6f6d713bfc0eff324a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 1 Sep 2019 17:22:33 -0500
Subject: [PATCH] Expose internal current tick
---
src/main/java/org/bukkit/Bukkit.java | 9 +++++++++
src/main/java/org/bukkit/Server.java | 7 +++++++
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f87b8c3d..919ff23c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1619,6 +1619,15 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
+
+ /**
+ * Get the current internal server tick
+ *
+ * @return Current tick
+ */
+ public static int getCurrentTick() {
+ return server.getCurrentTick();
+ }
// Purpur end
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 14da1875..4ff5895f 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1414,5 +1414,12 @@ public interface Server extends PluginMessageRecipient {
* @return True if lagging
*/
boolean isLagging();
+
+ /**
+ * Get the current internal server tick
+ *
+ * @return Current tick
+ */
+ int getCurrentTick();
// Purpur end
}
--
2.23.0.rc1

35
patches/server/0064-Expose-internal-current-tick.patch Normal file
View File

@@ -0,0 +1,35 @@
From 5ee68a170abfe087c3085d8250d6029e66dc2cc4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 1 Sep 2019 17:22:43 -0500
Subject: [PATCH] Expose internal current tick
---
src/main/java/org/bukkit/craftbukkit/CraftServer.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 52298bc5b..cd278985e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -64,6 +64,7 @@ import net.minecraft.server.JsonListEntry;
import net.minecraft.server.LootTableRegistry;
import net.minecraft.server.MapIcon;
import net.minecraft.server.MinecraftKey;
+import net.minecraft.server.MinecraftServer;
import net.minecraft.server.MobEffects;
import net.minecraft.server.PlayerList;
import net.minecraft.server.ServerCommand;
@@ -2177,5 +2178,10 @@ public final class CraftServer implements Server {
public boolean isLagging() {
return getServer().lagging;
}
+
+ @Override
+ public int getCurrentTick() {
+ return MinecraftServer.currentTick;
+ }
// Purpur end
}
--
2.23.0.rc1