SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Mouse Movement for Wild Teleportation & Properly initialized tntfill aliases

Browse Source
This commit is contained in:
Driftay 2020-01-27 00:47:48 -05:00
parent 591dc2172f
commit 8ff8c78a44
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java
View File

@ -26,7 +26,7 @@ public class CmdTntFill extends FCommand {
public CmdTntFill() { public CmdTntFill() {
super(); super();
this.aliases.add("tntfill"); this.aliases.addAll(Aliases.tnt_tntfill);
this.requiredArgs.add("radius"); this.requiredArgs.add("radius");
this.requiredArgs.add("amount"); this.requiredArgs.add("amount");

14
src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
View File

@ -920,6 +920,8 @@ public class FactionsPlayerListener implements Listener {
} }
} }
@EventHandler @EventHandler
public void onLogoutMove(PlayerMoveEvent e) { public void onLogoutMove(PlayerMoveEvent e) {
LogoutHandler handler = LogoutHandler.getByName(e.getPlayer().getName()); LogoutHandler handler = LogoutHandler.getByName(e.getPlayer().getName());
@ -927,6 +929,12 @@ public class FactionsPlayerListener implements Listener {
handler.cancelLogout(e.getPlayer()); handler.cancelLogout(e.getPlayer());
e.getPlayer().sendMessage(String.valueOf(TL.COMMAND_LOGOUT_MOVED)); e.getPlayer().sendMessage(String.valueOf(TL.COMMAND_LOGOUT_MOVED));
} }
if (e.getTo().getBlockX() == e.getFrom().getBlockX() &&
e.getTo().getBlockY() == e.getFrom().getBlockY() &&
e.getTo().getBlockZ() == e.getFrom().getBlockZ())
return;
if (CmdWild.waitingTeleport.containsKey(e.getPlayer())) { if (CmdWild.waitingTeleport.containsKey(e.getPlayer())) {
CmdWild.waitingTeleport.remove(e.getPlayer()); CmdWild.waitingTeleport.remove(e.getPlayer());
FPlayers.getInstance().getByPlayer(e.getPlayer()).msg(TL.COMMAND_WILD_INTERUPTED); FPlayers.getInstance().getByPlayer(e.getPlayer()).msg(TL.COMMAND_WILD_INTERUPTED);
@ -1062,13 +1070,13 @@ public class FactionsPlayerListener implements Listener {
} }
FPlayer fp = FPlayers.getInstance().getByPlayer(e.getPlayer()); FPlayer fp = FPlayers.getInstance().getByPlayer(e.getPlayer());
if(fp == null) return; if (fp == null) return;
if (fp.getChatMode() != ChatMode.FACTION) { if (fp.getChatMode() != ChatMode.FACTION) {
return; return;
} }
Faction f = fp.getFaction(); Faction f = fp.getFaction();
if(f == null) return; if (f == null) return;
if (f.isSystemFaction()) { if (f.isSystemFaction()) {
return; return;
} }
@ -1087,7 +1095,7 @@ public class FactionsPlayerListener implements Listener {
} }
} else { } else {
for (Member m : t.getMembers()) { for (Member m : t.getMembers()) {
if (m.getEffectiveName().contains(target) | m.getUser().getName().contains(target)){ if (m.getEffectiveName().contains(target) | m.getUser().getName().contains(target)) {
targets.add("@" + m.getUser().getName() + "#" + m.getUser().getDiscriminator()); targets.add("@" + m.getUser().getName() + "#" + m.getUser().getDiscriminator());
} }
} }