diff --git a/src/me/yaruma/fightsystem/FightSystem.java b/src/me/yaruma/fightsystem/FightSystem.java index 75d8cbe..03e9896 100644 --- a/src/me/yaruma/fightsystem/FightSystem.java +++ b/src/me/yaruma/fightsystem/FightSystem.java @@ -237,7 +237,7 @@ public class FightSystem extends JavaPlugin { for(FightPlayer allFightPlayers : Fight.getRedTeam().getPlayers()) { allFightPlayers.getPlayer().getInventory().clear(); } - instance.getFightManager().teleportAllToFightSpawn(); + getFightManager().teleportAllToFightSpawn(); WorldEdit.replace(Fight.getBlueTeam().getLeader().getPlayer(), team1cornerX, team1cornerY, team1cornerZ, team1cornerX + schemsizeX, team1cornerY + schemsizeY, team1cornerZ + schemsizeZ); WorldEdit.replace(Fight.getRedTeam().getLeader().getPlayer(), team2cornerX, team2cornerY, team2cornerZ, team2cornerX + schemsizeX, team2cornerY + schemsizeY, team2cornerZ + schemsizeZ); } @@ -267,7 +267,7 @@ public class FightSystem extends JavaPlugin { } public void setSpectateState(FightTeam winFightTeam) { - if(this.fightState != FightState.RUNNING): + if(this.fightState != FightState.RUNNING) return; this.fightState = FightState.SPECTATE; diff --git a/src/me/yaruma/fightsystem/utils/Region.java b/src/me/yaruma/fightsystem/utils/Region.java index 6dad03e..2725bc6 100644 --- a/src/me/yaruma/fightsystem/utils/Region.java +++ b/src/me/yaruma/fightsystem/utils/Region.java @@ -22,7 +22,7 @@ public class Region { } public static boolean isIn2DRegion(Location location, int minX, int minZ, int maxX, int maxZ){ - return inRange(location.getBlockX(), minX, maxX, margin) && inRange(location.getBlockZ(), minZ, maxZ, margin); + return inRange(location.getBlockX(), minX, maxX) && inRange(location.getBlockZ(), minZ, maxZ); } public static boolean inRange(double value, int min, int max, int margin){