OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4147: Fix ItemFrames not able to be placed UP or DOWN

Browse source
This commit is contained in:
Senmori 2018-07-24 18:41:49 -04:00 committed by md_5
parent 88d89792fc
commit 9646d8d780
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java
View file

@ -1,11 +1,10 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.BlockPosition;
import net.minecraft.server.EntityHanging; import net.minecraft.server.EntityHanging;
import net.minecraft.server.EnumDirection; import net.minecraft.server.EnumDirection;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Hanging; import org.bukkit.entity.Hanging;
@ -51,17 +50,7 @@ public class CraftHanging extends CraftEntity implements Hanging {
public BlockFace getFacing() { public BlockFace getFacing() {
EnumDirection direction = this.getHandle().direction; EnumDirection direction = this.getHandle().direction;
if (direction == null) return BlockFace.SELF; if (direction == null) return BlockFace.SELF;
switch (direction) { return CraftBlock.notchToBlockFace(direction);
case SOUTH:
default:
return BlockFace.SOUTH;
case WEST:
return BlockFace.WEST;
case NORTH:
return BlockFace.NORTH;
case EAST:
return BlockFace.EAST;
}
} }
@Override @Override

11
src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View file

@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import net.minecraft.server.EntityHanging;
import net.minecraft.server.EntityItemFrame; import net.minecraft.server.EntityItemFrame;
import net.minecraft.server.EnumDirection; import net.minecraft.server.EnumDirection;
import net.minecraft.server.ItemStack; import net.minecraft.server.ItemStack;
@ -12,6 +13,7 @@ import org.bukkit.Rotation;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.ItemFrame; import org.bukkit.entity.ItemFrame;
@ -21,8 +23,15 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
super(server, entity); super(server, entity);
} }
@Override
public boolean setFacingDirection(BlockFace face, boolean force) { public boolean setFacingDirection(BlockFace face, boolean force) {
if (!super.setFacingDirection(face, force)) { EntityHanging hanging = getHandle();
EnumDirection oldDir = hanging.direction;
EnumDirection newDir = CraftBlock.blockFaceToNotch(face);
getHandle().setDirection(newDir);
if (!force && !hanging.survives()) {
hanging.setDirection(oldDir);
return false; return false;
} }