merge some patches & re-enable timings

This commit is contained in:
Ben Kerllenevich
2021-08-20 17:41:02 -04:00
parent d918b4f0c6
commit 6e1ad89162
54 changed files with 75 additions and 64 deletions

View File

@@ -26,10 +26,10 @@ index 24523dd712329f2f3abe40bb3f1801ef7946e831..ebd744b08e27d6fc6dda31ada7ad8bb1
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7474ead18b667290c6bbe1d692b09d58bccf6b39..98751b195e5bea9ef89e1432fba54d6823036818 100644
index e409c6c4f4da1cb2d4a42971dbc362a258a51d3b..0c1d64731c3c9581b0cf9b720057ef07be4f764e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2595,5 +2595,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2600,5 +2600,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}