zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed IllegalArgumentException when performing rollbacks on armor stand contents

Browse source
This commit is contained in:
Intelli 2022-02-22 19:40:39 -07:00
parent b96f47cbac
commit f80c6ab5cd
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/coreprotect/database/Rollback.java
View file

@ -1107,7 +1107,6 @@ public class Rollback extends Queue {
containerType = block.getType(); containerType = block.getType();
} }
else if (BlockGroup.CONTAINERS.contains(Material.ARMOR_STAND) || BlockGroup.CONTAINERS.contains(Material.ITEM_FRAME)) { else if (BlockGroup.CONTAINERS.contains(Material.ARMOR_STAND) || BlockGroup.CONTAINERS.contains(Material.ITEM_FRAME)) {
BlockFace blockFace = BlockFace.valueOf(faceData);
for (Entity entity : block.getChunk().getEntities()) { for (Entity entity : block.getChunk().getEntities()) {
if (entity.getLocation().getBlockX() == rowX && entity.getLocation().getBlockY() == rowY && entity.getLocation().getBlockZ() == rowZ) { if (entity.getLocation().getBlockX() == rowX && entity.getLocation().getBlockY() == rowY && entity.getLocation().getBlockZ() == rowZ) {
if (entity instanceof ArmorStand) { if (entity instanceof ArmorStand) {
@ -1117,7 +1116,7 @@ public class Rollback extends Queue {
else if (entity instanceof ItemFrame) { else if (entity instanceof ItemFrame) {
container = entity; container = entity;
containerType = Material.ITEM_FRAME; containerType = Material.ITEM_FRAME;
if (blockFace == ((ItemFrame) entity).getFacing()) { if (faceData.length() > 0 && (BlockFace.valueOf(faceData) == ((ItemFrame) entity).getFacing())) {
break; break;
} }
} }