Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-04-12 07:06:02 +02:00
Code Issues Projects Releases Wiki Activity

Simplify command block logic

Browse Source
This commit is contained in:
fullwall 2022-12-27 19:24:42 +08:00
parent ef49f0762e
commit 027e4d27a9
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
main/src/main/java/net/citizensnpcs/npc/NPCSelector.java
View File

@ -133,35 +133,16 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
Editor.leave(player);
} else if (sender instanceof BlockCommandSender) {
Block block = ((BlockCommandSender) sender).getBlock();
if (SUPPORT_BLOCK_STATE == null) {
try {
block.getState();
SUPPORT_BLOCK_STATE = true;
} catch (Exception ex) {
SUPPORT_BLOCK_STATE = false;
}
}
while (block != null) {
setMetadata(npc, block);
selectors.add(toName(block));
if (SUPPORT_BLOCK_STATE) {
if (block.getState() instanceof org.bukkit.block.data.Directional) {
block = block.getRelative(((org.bukkit.block.data.Directional) block.getState()).getFacing());
if (!(block.getState() instanceof org.bukkit.block.CommandBlock)) {
block = null;
}
} else {
if (block.getBlockData() instanceof org.bukkit.block.data.Directional) {
block = block.getRelative(((org.bukkit.block.data.Directional) block.getState()).getFacing());
if (!block.getType().name().contains("COMMAND_BLOCK")) {
block = null;
}
} else {
if (block.getBlockData() instanceof org.bukkit.material.Directional) {
block = block.getRelative(((org.bukkit.material.Directional) block.getState()).getFacing());
if (!(block.getBlockData() instanceof org.bukkit.block.data.type.CommandBlock)) {
block = null;
}
} else {
block = null;
}
block = null;
}
}
} else if (sender instanceof ConsoleCommandSender) {
@ -183,6 +164,4 @@ public class NPCSelector implements Listener, net.citizensnpcs.api.npc.NPCSelect
return '@' + block.getWorld().getName() + ":" + Integer.toString(block.getX()) + ":"
+ Integer.toString(block.getY()) + ":" + Integer.toString(block.getZ());
}
private static Boolean SUPPORT_BLOCK_STATE = null;
}