mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-30 23:39:58 +01:00
f44d237de9
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 5be41fb8 SPIGOT-6720: Fix bed explosion checks 09b99daf SPIGOT-6722: Close entity manager when unloading world 3a9561bf SPIGOT-6686: Changes in MaximumRepairCost for Anvil Rename cause inconsistency
22 lines
880 B
Diff
22 lines
880 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Sat, 20 Apr 2019 19:47:34 -0500
|
|
Subject: [PATCH] Expose the internal current tick
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 46a1c05f3321ddf34efc4f5fb6b607188a8c4939..34c8228de823c777209c6506451222d82ad80738 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2506,5 +2506,10 @@ public final class CraftServer implements Server {
|
|
}
|
|
return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getCurrentTick() {
|
|
+ return net.minecraft.server.MinecraftServer.currentTick;
|
|
+ }
|
|
// Paper end
|
|
}
|