core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0339-Pass-World-to-Tile-Ent...

23 lines
988 B
Diff
Raw Normal View History

[CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding
2018-08-17 22:01:37 +00:00
From 7b82f52eaee912f0f66890193ac72a3634d2f6d6 Mon Sep 17 00:00:00 2001
Fix NPE in CraftBanner due to null world, potentially other things fixed Banners only load color if the world is set. I don't know why... For some reason, the world was not set on these, so it was changing behavior. So if we want an accurate clone, world needs to be set.
2018-08-15 05:21:10 +00:00
From: Aikar <aikar@aikar.co>
Date: Wed, 15 Aug 2018 01:19:04 -0400
Subject: [PATCH] Pass World to Tile Entity Snapshots
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
[CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding
2018-08-17 22:01:37 +00:00
index d4d9c5fc5..a72bbdbed 100644
Fix NPE in CraftBanner due to null world, potentially other things fixed Banners only load color if the world is set. I don't know why... For some reason, the world was not set on these, so it was changing behavior. So if we want an accurate clone, world needs to be set.
2018-08-15 05:21:10 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -50,7 +50,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
if (DISABLE_SNAPSHOT) {
this.snapshot = this.tileEntity;
} else {
- this.snapshot = this.createSnapshot(this.tileEntity, null);
+ this.snapshot = this.createSnapshot(this.tileEntity, tileEntity.getWorld());
}
// copy tile entity data:
if(this.snapshot != null) {
--
2.18.0