Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 10:17:38 +01:00
Code Issues Projects Releases Wiki Activity

Fix CraftBanner initialisation.

Browse Source 
By: Lukas Hennig <lukas@wirsindwir.de>
This commit is contained in:
CraftBukkit/Spigot 2017-08-07 03:30:41 +02:00
parent 89b3d6e8a6
commit 1ca95d2193
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBanner.java
View File

@ -16,7 +16,7 @@ import org.bukkit.block.banner.PatternType;
public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> implements Banner { public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> implements Banner {
private DyeColor base; private DyeColor base;
private List<Pattern> patterns = new ArrayList<Pattern>(); private List<Pattern> patterns;
public CraftBanner(final Block block) { public CraftBanner(final Block block) {
super(block, TileEntityBanner.class); super(block, TileEntityBanner.class);
@ -31,6 +31,7 @@ public class CraftBanner extends CraftBlockEntityState<TileEntityBanner> impleme
super.load(banner); super.load(banner);
base = DyeColor.getByDyeData((byte) banner.color.getInvColorIndex()); base = DyeColor.getByDyeData((byte) banner.color.getInvColorIndex());
patterns = new ArrayList<Pattern>();
if (banner.patterns != null) { if (banner.patterns != null) {
for (int i = 0; i < banner.patterns.size(); i++) { for (int i = 0; i < banner.patterns.size(); i++) {

2
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
View File

@ -84,7 +84,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
return snapshot.save(new NBTTagCompound()); return snapshot.save(new NBTTagCompound());
} }
// copies the data of the given tile entity data to this block state // copies the data of the given tile entity to this block state
protected void load(T tileEntity) { protected void load(T tileEntity) {
if (tileEntity != null && tileEntity != snapshot) { if (tileEntity != null && tileEntity != snapshot) {
copyData(tileEntity, snapshot); copyData(tileEntity, snapshot);