mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
2d212d6e78
Upstream has released updates that appears to apply and compile correctly Paper Changes: 7caed1a8 [CI-SKIP] Rebuild patches 777073a5 Check horse entity validity in container interactions (#2584) d69fe6c5 Fix zero-tick instant grow farms MC-113809 (#2559) c68dbb86 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576) 1e521994 Update Paperclip 30f9955e Fix race conditions in flush allowing for previously scheduled tasks to execute later than the flush call (#2548) 9e1620e3 Improve save logic (#2485) 72860501 [CI-SKIP] Fix duplicate patch number 87355875 Fix nether portal frame creation (#2546) 26acc9b7 Re-add flat bedrock config option
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From a7144d19244acb40588253a5f6f04de9f16c4498 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
|
|
|