mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 12:05:53 +01:00
36f34f01c0
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 Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 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 ddaed81275fcc12d1671b668697acf318e96888b..203cda0f9a4dea4f28a21ea9ee8db7a7369842e3 100644
|
|
--- a/src/main/java/co/aikar/timings/TimingHistory.java
|
|
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
|
|
@@ -119,7 +119,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;
|