Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

Make /npc tphere center and cursor work consistently

Browse Source
This commit is contained in:
fullwall 2020-08-10 18:02:35 +08:00
parent 21b2908e83
commit 2f6395884a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -24,6 +24,7 @@ import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.command.BlockCommandSender; import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
@ -2167,15 +2168,16 @@ public class NPCCommands {
Block target = ((Player) sender).getTargetBlock(null, 64); Block target = ((Player) sender).getTargetBlock(null, 64);
if (target == null) if (target == null)
throw new CommandException(Messages.MISSING_TP_CURSOR_BLOCK); throw new CommandException(Messages.MISSING_TP_CURSOR_BLOCK);
to = target.getLocation(); to = target.getRelative(BlockFace.UP).getLocation();
} }
if (!sender.hasPermission("citizens.npc.tphere.multiworld") if (!sender.hasPermission("citizens.npc.tphere.multiworld")
&& npc.getStoredLocation().getWorld() != args.getSenderLocation().getWorld()) { && npc.getStoredLocation().getWorld() != args.getSenderLocation().getWorld()) {
throw new CommandException(Messages.CANNOT_TELEPORT_ACROSS_WORLDS); throw new CommandException(Messages.CANNOT_TELEPORT_ACROSS_WORLDS);
} }
if (args.hasFlag('c')) { if (args.hasFlag('c')) {
to.setX(Math.round(to.getX() * 2) / 2.0); to = to.getBlock().getLocation();
to.setZ(Math.round(to.getZ() * 2) / 2.0); to.setX(to.getX() + 0.5);
to.setZ(to.getZ() + 0.5);
} }
if (!npc.isSpawned()) { if (!npc.isSpawned()) {
npc.spawn(to, SpawnReason.COMMAND); npc.spawn(to, SpawnReason.COMMAND);