ea855e2b46
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
From 9b0f9c9ee09a34ffae2c2a19e184e5a4a81ecace Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 15 Aug 2018 01:19:37 -0400
|
|
Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports
|
|
|
|
|
|
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
|
|
index 8726bb9a2..21b929f94 100644
|
|
--- a/src/main/java/co/aikar/timings/TimingHistory.java
|
|
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
|
|
@@ -122,7 +122,7 @@ public class TimingHistory {
|
|
data.entityCounts.get(entity.getType()).increment();
|
|
}
|
|
|
|
- for (BlockState tileEntity : chunk.getTileEntities()) {
|
|
+ for (BlockState tileEntity : chunk.getTileEntities(false)) {
|
|
if (tileEntity == null) {
|
|
Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ());
|
|
continue;
|
|
--
|
|
2.21.0
|
|
|