From c34673ac14d04481310dbc375d755dff6c42ce73 Mon Sep 17 00:00:00 2001 From: Poslovitch Date: Sun, 20 Aug 2017 18:37:09 +0200 Subject: [PATCH] Blockstates must be explicitly updated as of 1.12.1 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/391 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/395 --- .../Slimefun/Android/ProgrammableAndroid.java | 10 +++++----- .../Slimefun/Objects/SlimefunItem/EnhancedFurnace.java | 2 +- src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java b/src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java index 13025e722..3ddefc56a 100644 --- a/src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java +++ b/src/me/mrCookieSlime/Slimefun/Android/ProgrammableAndroid.java @@ -200,7 +200,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { b.setData((byte) 1); Skull skull = (Skull) b.getState(); skull.setRotation(BlockFace.NORTH); - skull.update(); + skull.update(true, false); } @Override @@ -297,7 +297,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { BlockFace dir = directions.get(rotIndex); Skull skull = (Skull) b.getState(); skull.setRotation(dir); - skull.update(); + skull.update(true, false); BlockStorage.addBlockInfo(b, "rotation", dir.toString()); break; } @@ -307,7 +307,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { BlockFace dir = directions.get(rotIndex); Skull skull = (Skull) b.getState(); skull.setRotation(dir); - skull.update(); + skull.update(true, false); BlockStorage.addBlockInfo(b, "rotation", dir.toString()); break; } @@ -690,7 +690,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { Skull skull = (Skull) block.getState(); skull.setRotation(face); - skull.update(); + skull.update(true, false); CustomSkull.setSkull(block, CustomSkull.getTexture(getItem())); b.setType(Material.AIR); BlockStorage.moveBlockInfo(b, block); @@ -723,7 +723,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { Skull skull = (Skull) block.getState(); skull.setRotation(face); - skull.update(); + skull.update(true, false); CustomSkull.setSkull(block, CustomSkull.getTexture(getItem())); b.setType(Material.AIR); BlockStorage.moveBlockInfo(b, block); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index 5d5942816..734033d37 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -32,7 +32,7 @@ public class EnhancedFurnace extends SlimefunItem { if (((Furnace) b.getState()).getCookTime() > 0) { ((Furnace) b.getState()).setCookTime((short) (((Furnace) b.getState()).getCookTime() + getSpeed() * 10)); } - b.getState().update(); + b.getState().update(true, false); } catch(NullPointerException x) { } } diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index 93834d4ff..172349ebc 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -2715,6 +2715,7 @@ public class SlimefunSetup { } if (type != null) { ((CreatureSpawner) e.getBlock().getState()).setSpawnedType(type); + e.getBlock().getState().update(true, false); } return true; }