mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
merge some patches & re-enable timings
This commit is contained in:
@@ -142,10 +142,10 @@ index 58b2f795b7018ac92fd72369bbe58d2f2c266adc..613dd74b460c0bd15fc8fd4e78380a81
|
||||
|
||||
public boolean babiesAreRidable = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index c5c611cfba9feb18d417b45e9909e08be7743e22..ec4397cc98b66fef55a91854c42518479b839bbe 100644
|
||||
index 4254b3168f34b5d6ab9ac8bcece37ab02478b8e9..47f3eccc14b98adf41c9e6fe10b5b683bb94dc85 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2570,5 +2570,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -2575,5 +2575,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
public void resetIdleTimer() {
|
||||
getHandle().resetLastActionTime();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user