F Home and ClaimAt Fix

This commit is contained in:
Driftay 2019-11-14 03:44:35 -05:00
parent d808bac17b
commit 8c7addb68e

View File

@ -23,7 +23,7 @@ public class CmdHome extends FCommand {
public CmdHome() { public CmdHome() {
super(); super();
this.aliases.add("home"); this.aliases.add("home");
this.optionalArgs.put("faction", "yours"); this.optionalArgs.put("home", "faction-name");
this.requirements = new CommandRequirements.Builder(Permission.HOME) this.requirements = new CommandRequirements.Builder(Permission.HOME)
.playerOnly() .playerOnly()
@ -87,7 +87,8 @@ public class CmdHome extends FCommand {
if (Conf.homesTeleportAllowedEnemyDistance > 0 if (Conf.homesTeleportAllowedEnemyDistance > 0
&& !faction.isSafeZone() && !faction.isSafeZone()
&& (!context.fPlayer.isInOwnTerritory() && (!context.fPlayer.isInOwnTerritory()
|| (context.fPlayer.isInOwnTerritory() && !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) { || (context.fPlayer.isInOwnTerritory()
&& !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) {
World w = loc.getWorld(); World w = loc.getWorld();
double x = loc.getX(); double x = loc.getX();