928bcc8d3a
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 Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
20 Zeilen
1.1 KiB
Diff
20 Zeilen
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;
|