From 175a4a6a124ab149b6bddf112f853ef49e71157e Mon Sep 17 00:00:00 2001 From: Naman Date: Fri, 13 Apr 2018 21:31:37 -0500 Subject: [PATCH] 1.1-RELEASECANDIDATE-2 Scoreboard bug fixed inspect message disable fixed --- src/main/java/com/massivecraft/factions/cmd/CmdInspect.java | 2 +- .../factions/listeners/FactionsEntityListener.java | 4 ++-- src/main/java/com/massivecraft/factions/zcore/util/TL.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdInspect.java b/src/main/java/com/massivecraft/factions/cmd/CmdInspect.java index 8ca32b6c..c6ffe90f 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdInspect.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdInspect.java @@ -25,7 +25,7 @@ public class CmdInspect extends FCommand public void perform(){ if (fme.isInspectMode()){ fme.setInspectMode(false); - msg(TL.COMMAND_INSPECT_DISABLED); + msg(TL.COMMAND_INSPECT_DISABLED_MSG); } else { fme.setInspectMode(true); msg(TL.COMMAND_INSPECT_ENABLED); diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index bf0f2894..ae2645c9 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -147,7 +147,7 @@ public class FactionsEntityListener implements Listener { FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damagee); if (fplayer.isInspectMode()){ fplayer.setInspectMode(false); - fplayer.msg(TL.COMMAND_INSPECT_DISABLED); + fplayer.msg(TL.COMMAND_INSPECT_DISABLED_MSG); } } if (damager instanceof Player) { @@ -156,7 +156,7 @@ public class FactionsEntityListener implements Listener { FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damager); if (fplayer.isInspectMode()){ fplayer.setInspectMode(false); - fplayer.msg(TL.COMMAND_INSPECT_DISABLED); + fplayer.msg(TL.COMMAND_INSPECT_DISABLED_MSG); } } } else if (Conf.safeZonePreventAllDamageToPlayers && isPlayerInSafeZone(event.getEntity())) { diff --git a/src/main/java/com/massivecraft/factions/zcore/util/TL.java b/src/main/java/com/massivecraft/factions/zcore/util/TL.java index c5d60edc..8ef1047b 100644 --- a/src/main/java/com/massivecraft/factions/zcore/util/TL.java +++ b/src/main/java/com/massivecraft/factions/zcore/util/TL.java @@ -309,7 +309,7 @@ public enum TL { COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"), COMMAND_HOME_DESCRIPTION("Teleport to the faction home"), - COMMAND_INSPECT_DISABLED("&c&l[!]&7 Inspect mode is now &cdisabled."), + COMMAND_INSPECT_DISABLED_MSG("&c&l[!]&7 Inspect mode is now &cdisabled."), COMMAND_INSPECT_DISABLED_NOFAC("&c&l[!]&7 Inspect mode is now &cdisabled,&7 because you &cdo not have a faction!"), COMMAND_INSPECT_ENABLED("&c&l[!]&7 Inspect mode is now &aEnabled."), COMMAND_INSPECT_HEADER("&c&m---&7Inspect Data&c&m---&c//&7x:{x},y:{y},z:{z}"), @@ -901,7 +901,7 @@ public enum TL { FACTION_LEAVE("faction-leave", "Leaving %1$s, Entering %2$s"), FACTIONS_ANNOUNCEMENT_TOP("faction-announcement-top", "&d--Unread Faction Announcements--"), FACTIONS_ANNOUNCEMENT_BOTTOM("faction-announcement-bottom", "&d--Unread Faction Announcements--"), - DEFAULT_PREFIX("default-prefix", "{relationcolor}[{faction}] &r {player-name}"), + DEFAULT_PREFIX("default-prefix", "{relationcolor}[{faction}]"), FACTION_LOGIN("faction-login", "&e%1$s &9logged in."), FACTION_LOGOUT("faction-logout", "&e%1$s &9logged out.."), NOFACTION_PREFIX("nofactions-prefix", "&6[&a4-&6]&r"),