Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve faction fly

Browse Source
This commit is contained in:
Magnus Ulf
2019-01-31 10:38:48 +01:00
parent 59d8091ca8
commit 9e81d6d865
4 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/massivecraft/factions/cmd/CmdFactionsFlag.java
View File

@@ -6,8 +6,8 @@ public class CmdFactionsFlag extends FactionsCommand
// FIELDS
// -------------------------------------------- //
CmdFactionsFlagList cmdFactionsFlagList = new CmdFactionsFlagList();
CmdFactionsFlagShow cmdFactionsFlagShow = new CmdFactionsFlagShow();
CmdFactionsFlagSet cmdFactionsFlagSet = new CmdFactionsFlagSet();
public CmdFactionsFlagList cmdFactionsFlagList = new CmdFactionsFlagList();
public CmdFactionsFlagShow cmdFactionsFlagShow = new CmdFactionsFlagShow();
public CmdFactionsFlagSet cmdFactionsFlagSet = new CmdFactionsFlagSet();
}

12
src/com/massivecraft/factions/cmd/CmdFactionsFly.java
View File

@@ -4,9 +4,9 @@ import com.massivecraft.factions.engine.EngineFly;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.MassiveCommandToggle;
import com.massivecraft.massivecore.command.requirement.RequirementIsPlayer;
import com.massivecraft.massivecore.engine.EngineMassiveCorePlayerUpdate;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.util.IdUtil;
import org.bukkit.entity.Player;
public class CmdFactionsFly extends MassiveCommandToggle
@@ -24,8 +24,7 @@ public class CmdFactionsFly extends MassiveCommandToggle
public CmdFactionsFly()
{
super();
this.setAliases("fly");
this.addRequirements(RequirementIsPlayer.get());
}
// -------------------------------------------- //
@@ -47,14 +46,11 @@ public class CmdFactionsFly extends MassiveCommandToggle
public void setValue(boolean value) throws MassiveException
{
MPlayer mplayer = MPlayer.get(sender);
Player player = IdUtil.getPlayer(sender);
Player player = me;
if (player == null) throw new MassiveException().addMsg("<b>Could not find player.");
PS ps = PS.valueOf(player);
if (value && !EngineFly.canFlyInTerritory(mplayer, ps))
{
throw new MassiveException().addMsg("<b>You can't fly where you are.");
}
if (value) EngineFly.canFlyInTerritoryOrThrow(mplayer, ps);
mplayer.setFlying(value);
EngineMassiveCorePlayerUpdate.update(player, false);

2
src/com/massivecraft/factions/cmd/FactionsCommand.java
View File

@@ -19,7 +19,7 @@ public class FactionsCommand extends MassiveCommand
public FactionsCommand()
{
this.setSetupEnabled(true);
}
// -------------------------------------------- //