mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

SPIGOT-4446: Legacy rotation methods don't work for wall mounted skulls

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2018-10-27 08:15:41 +11:00
commit 77d92cd515
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
View file

@ -12,6 +12,8 @@ import org.bukkit.SkullType;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.Skull; import org.bukkit.block.Skull;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Rotatable; import org.bukkit.block.data.Rotatable;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
@ -106,13 +108,18 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
@Override @Override
public BlockFace getRotation() { public BlockFace getRotation() {
return ((Rotatable) getBlockData()).getRotation(); BlockData blockData = getBlockData();
return (blockData instanceof Rotatable) ? ((Rotatable) blockData).getRotation() : ((Directional) blockData).getFacing();
} }
@Override @Override
public void setRotation(BlockFace rotation) { public void setRotation(BlockFace rotation) {
Rotatable blockData = (Rotatable) getBlockData(); BlockData blockData = getBlockData();
blockData.setRotation(rotation); if (blockData instanceof Rotatable) {
((Rotatable) blockData).setRotation(rotation);
} else {
((Directional) blockData).setFacing(rotation);
}
setBlockData(blockData); setBlockData(blockData);
} }