Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2025-01-26 17:31:38 +01:00
Code Issues Projects Releases Wiki Activity

Remove requirement for standing in the center of a block to set spawn

Browse Source
This commit is contained in:
Esophose 2019-04-17 20:36:12 -06:00
parent f2ad1d1481
commit a92a8abee3
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/me/goodandevil/skyblock/command/commands/island/SetSpawnCommand.java
View File

@ -92,31 +92,20 @@ public class SetSpawnCommand extends SubCommand {
return; return;
} else { } else {
if (LocationUtil.isLocationCentreOfBlock(location)) { if (location.getBlock().getType() != Material.AIR && location.getBlock().getType() != Materials.MOVING_PISTON.parseMaterial()) {
new BukkitRunnable() { location.getBlock().breakNaturally();
public void run() {
if (location.getBlock().getType() != Material.AIR && location.getBlock().getType() != Materials.MOVING_PISTON.parseMaterial()) {
location.getBlock().breakNaturally();
}
if (location.clone().add(0.0D, 1.0D, 0.0D).getBlock().getType() != Material.AIR && location.getBlock().getType() != Materials.MOVING_PISTON.parseMaterial()) {
location.clone().add(0.0D, 1.0D, 0.0D).getBlock().breakNaturally();
}
islandManager.removeSpawnProtection(island.getLocation(world, environment));
}
}.runTask(skyblock);
} else {
messageManager.sendMessage(player, configLoad
.getString("Command.Island.SetSpawn.Protection.Centre.Message"));
soundManager.playSound(player, Sounds.ANVIL_LAND.bukkitSound(), 1.0F, 1.0F);
return;
} }
if (location.clone().add(0.0D, 1.0D, 0.0D).getBlock().getType() != Material.AIR && location.getBlock().getType() != Materials.MOVING_PISTON.parseMaterial()) {
location.clone().add(0.0D, 1.0D, 0.0D).getBlock().breakNaturally();
}
islandManager.removeSpawnProtection(island.getLocation(world, environment));
} }
} }
island.setLocation(world, environment, location); Location newSpawnLocation = new Location(location.getWorld(), location.getBlockX() + 0.5, location.getBlockY(), location.getBlockZ() + 0.5, location.getYaw(), location.getPitch());
island.setLocation(world, environment, newSpawnLocation);
messageManager.sendMessage(player, messageManager.sendMessage(player,
configLoad.getString("Command.Island.SetSpawn.Set.Message").replace("%spawn", configLoad.getString("Command.Island.SetSpawn.Set.Message").replace("%spawn",

10
src/main/java/me/goodandevil/skyblock/utils/world/LocationUtil.java
View File

@ -23,16 +23,6 @@ import java.util.logging.Level;
public final class LocationUtil { public final class LocationUtil {
public static boolean isLocationCentreOfBlock(Location location) {
double x = location.getX() - location.getBlockX() - 0.5D, z = location.getZ() - location.getBlockZ() - 0.5D;
if (Math.abs(x) < 0.2D && Math.abs(z) < 0.2D) {
return true;
}
return false;
}
public static boolean isLocationLocation(Location location1, Location location2) { public static boolean isLocationLocation(Location location1, Location location2) {
if (location1.getBlockX() == location2.getBlockX() && location1.getBlockY() == location2.getBlockY() if (location1.getBlockX() == location2.getBlockX() && location1.getBlockY() == location2.getBlockY()
&& location1.getBlockZ() == location2.getBlockZ()) { && location1.getBlockZ() == location2.getBlockZ()) {