Upstream/GriefDefender
1
0
Fork 0
mirror of https://github.com/bloodmc/GriefDefender.git synced 2025-01-22 21:51:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent TP if world is not loaded. Fixes #191

Browse Source
This commit is contained in:
bloodshot 2020-04-30 18:26:35 -04:00
parent c3b6e3b6fb
commit 051632eba6
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/src/main/java/com/griefdefender/command/CommandHelper.java
View File

@ -992,6 +992,12 @@ public static Consumer<CommandSender> createTeleportConsumer(CommandSender src,
} }
final Player player = (Player) src; final Player player = (Player) src;
// check if world is loaded
if (Bukkit.getWorld(location.getWorld().getUID()) == null) {
TextAdapter.sendComponent(player, MessageCache.getInstance().TELEPORT_NO_SAFE_LOCATION);
return;
}
final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getPlayerData(player.getWorld(), player.getUniqueId()); final GDPlayerData playerData = GriefDefenderPlugin.getInstance().dataStore.getPlayerData(player.getWorld(), player.getUniqueId());
final int teleportDelay = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), player, Options.PLAYER_TELEPORT_DELAY, claim); final int teleportDelay = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), player, Options.PLAYER_TELEPORT_DELAY, claim);
if (isClaimSpawn) { if (isClaimSpawn) {

4
bukkit/src/main/java/com/griefdefender/util/PlayerUtil.java
View File

@ -225,6 +225,10 @@ public void sendInteractEntityDenyMessage(GDClaim claim, Player player, ItemStac
} }
public boolean isSafeLocation(Location location) { public boolean isSafeLocation(Location location) {
// check if world is loaded
if (Bukkit.getWorld(location.getWorld().getUID()) == null) {
return false;
}
final Block currentBlock = location.getBlock(); final Block currentBlock = location.getBlock();
final Block aboveBlock = currentBlock.getRelative(BlockFace.UP); final Block aboveBlock = currentBlock.getRelative(BlockFace.UP);
final Block belowBlock =currentBlock.getRelative(BlockFace.DOWN); final Block belowBlock =currentBlock.getRelative(BlockFace.DOWN);