mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
394c0f02f8
Upstream has released updates that appears to apply and compile correctly Paper Changes: 14513c3c Updated Upstream (Bukkit/CraftBukkit)
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From f19d0643ea0a1abc2d6acdc9af45701d29d16fd0 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
|
|
|