mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-30 16:19:03 +01:00
262c08f64f
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: 2ed3e3e6e SPIGOT-7210: Fix structures in custom worlds 585ab5ba1 SPIGOT-7207: WorldCreator creates world as super flat even when normal is specified
21 lines
975 B
Diff
21 lines
975 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 56783cacf0b2e3042ce8cdb1fd3745b6b19d3226..7bc16e221b37629708299773519da60a1d9930ac 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2690,5 +2690,10 @@ public final class CraftServer implements Server {
|
|
profile.getProperties().putAll(((CraftPlayer)player).getHandle().getGameProfile().getProperties());
|
|
return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getCurrentTick() {
|
|
+ return net.minecraft.server.MinecraftServer.currentTick;
|
|
+ }
|
|
// Paper end
|
|
}
|