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

1.1-RELEASECANDIDATE-2

Browse Source 
Scoreboard bug fixed
inspect message disable fixed
This commit is contained in:
Naman 2018-04-13 21:31:37 -05:00
parent e36927db9f
commit 175a4a6a12
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ public class CmdInspect extends FCommand
public void perform(){ public void perform(){
if (fme.isInspectMode()){ if (fme.isInspectMode()){
fme.setInspectMode(false); fme.setInspectMode(false);
msg(TL.COMMAND_INSPECT_DISABLED); msg(TL.COMMAND_INSPECT_DISABLED_MSG);
} else { } else {
fme.setInspectMode(true); fme.setInspectMode(true);
msg(TL.COMMAND_INSPECT_ENABLED); msg(TL.COMMAND_INSPECT_ENABLED);

4
src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java
View File

@ -147,7 +147,7 @@ public class FactionsEntityListener implements Listener {
FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damagee); FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damagee);
if (fplayer.isInspectMode()){ if (fplayer.isInspectMode()){
fplayer.setInspectMode(false); fplayer.setInspectMode(false);
fplayer.msg(TL.COMMAND_INSPECT_DISABLED); fplayer.msg(TL.COMMAND_INSPECT_DISABLED_MSG);
} }
} }
if (damager instanceof Player) { if (damager instanceof Player) {
@ -156,7 +156,7 @@ public class FactionsEntityListener implements Listener {
FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damager); FPlayer fplayer = FPlayers.getInstance().getByPlayer((Player) damager);
if (fplayer.isInspectMode()){ if (fplayer.isInspectMode()){
fplayer.setInspectMode(false); fplayer.setInspectMode(false);
fplayer.msg(TL.COMMAND_INSPECT_DISABLED); fplayer.msg(TL.COMMAND_INSPECT_DISABLED_MSG);
} }
} }
} else if (Conf.safeZonePreventAllDamageToPlayers && isPlayerInSafeZone(event.getEntity())) { } else if (Conf.safeZonePreventAllDamageToPlayers && isPlayerInSafeZone(event.getEntity())) {

4
src/main/java/com/massivecraft/factions/zcore/util/TL.java
View File

@ -309,7 +309,7 @@ public enum TL {
COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"), COMMAND_HOME_FORTELEPORT("for teleporting to your faction home"),
COMMAND_HOME_DESCRIPTION("Teleport to the 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_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_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}"), 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", "<a>Leaving %1$s, <a>Entering %2$s"), FACTION_LEAVE("faction-leave", "<a>Leaving %1$s, <a>Entering %2$s"),
FACTIONS_ANNOUNCEMENT_TOP("faction-announcement-top", "&d--Unread Faction Announcements--"), FACTIONS_ANNOUNCEMENT_TOP("faction-announcement-top", "&d--Unread Faction Announcements--"),
FACTIONS_ANNOUNCEMENT_BOTTOM("faction-announcement-bottom", "&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_LOGIN("faction-login", "&e%1$s &9logged in."),
FACTION_LOGOUT("faction-logout", "&e%1$s &9logged out.."), FACTION_LOGOUT("faction-logout", "&e%1$s &9logged out.."),
NOFACTION_PREFIX("nofactions-prefix", "&6[&a4-&6]&r"), NOFACTION_PREFIX("nofactions-prefix", "&6[&a4-&6]&r"),