From 1f680b56f0cd7a5c1ca0878ea5940f338222962b Mon Sep 17 00:00:00 2001 From: Driftay Date: Fri, 24 May 2019 19:36:03 -0400 Subject: [PATCH] Upgrades Check & Check for Alts usage in faction --- src/main/java/com/massivecraft/factions/cmd/CmdAlts.java | 2 +- src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java | 2 +- src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java | 2 +- src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java | 3 +-- .../com/massivecraft/factions/zcore/persist/MemoryFPlayer.java | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java b/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java index c5baf7bb..f4a14c22 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdAlts.java @@ -22,7 +22,7 @@ public class CmdAlts extends FCommand { this.disableOnLock = false; senderMustBePlayer = true; - senderMustBeMember = false; + senderMustBeMember = true; senderMustBeModerator = false; senderMustBeAdmin = false; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java b/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java index 814462cf..792b7915 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java @@ -24,7 +24,7 @@ public class CmdInviteAlt extends FCommand { this.disableOnLock = true; senderMustBePlayer = true; - senderMustBeMember = false; + senderMustBeMember = true; senderMustBeModerator = false; senderMustBeColeader = false; senderMustBeAdmin = false; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java b/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java index 42f75228..ff68010e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java @@ -25,7 +25,7 @@ public class CmdKickAlt extends FCommand{ this.disableOnLock = false; senderMustBePlayer = true; - senderMustBeMember = false; + senderMustBeMember = true; senderMustBeModerator = false; senderMustBeAdmin = false; } diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java b/src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java index 19f85dd1..e81a83bb 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java @@ -30,8 +30,7 @@ public class CmdUpgrades extends FCommand { fme.sendMessage("This command is disabled!"); return; } - FUpgradesGUI fgui = new FUpgradesGUI(); - fgui.openMainMenu(fme); + new FUpgradesGUI().openMainMenu(fme); } @Override diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java index 82f37baa..928c0702 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java @@ -1069,7 +1069,7 @@ public abstract class MemoryFPlayer implements FPlayer { if (me == null) { return false; } - + int radius = Conf.stealthFlyCheckRadius; for (Entity e : me.getNearbyEntities(radius, 255, radius)) { if (e == null) {