Misc fixes and style changes

Author: ChanceSD

pvpmanager/src/main/java/me/chancesd/pvpmanager/command/Announce.java

@@ -5,7 +5,9 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 
+import me.chancesd.pvpmanager.setting.Lang;
 import me.chancesd.pvpmanager.setting.Permissions;
+import me.chancesd.pvpmanager.setting.lang.Replacement;
 import me.chancesd.sdutils.command.ArgumentType;
 import me.chancesd.sdutils.command.BaseCommand;
 import me.chancesd.sdutils.command.CommandArgument;
@@ -25,7 +27,7 @@ public void execute(final CommandSender sender, final String label, final List<C
 		final String message = getArgument(args, "message").getValue();
 
 		// Broadcast the message to all players
-		final String colorizedMessage = ChatUtils.colorize(message);
+		final String colorizedMessage = ChatUtils.colorize(message).replace(Replacement.PREFIX.getPlaceholder(), Lang.PREFIX.msg());
 		Bukkit.getOnlinePlayers().forEach(player -> player.sendMessage(colorizedMessage));
 
 		// Also send to console

pvpmanager/src/main/java/me/chancesd/pvpmanager/player/CombatPlayer.java

@@ -38,7 +38,7 @@ public class CombatPlayer extends EcoPlayer {
 
 	private boolean newbie;
 	private boolean tagged;
-	private boolean pvpState = Conf.DEFAULT_PVP.asBool() || CombatUtils.isNPC(getPlayer());
+	private boolean pvpState;
 	private boolean pvpLogged;
 	private boolean override;
 	private boolean loaded;
@@ -59,6 +59,7 @@ public class CombatPlayer extends EcoPlayer {
 	public CombatPlayer(@NotNull final Player player, final PvPManager plugin) {
 		super(player, plugin.getDependencyManager().getEconomy());
 		this.plugin = plugin;
+		this.pvpState = Conf.DEFAULT_PVP.asBool();
 		setCombatWorld(plugin.getWorldManager().getWorld(getPlayer().getWorld()));
 		initializeNameTag();
 	}
@@ -122,8 +123,12 @@ public final void disableFly() {
 	}
 
 	public final void setNewbie(final boolean newbie) {
+		setNewbie(newbie, 0);
+	}
+
+	public final void setNewbie(final boolean newbie, final long time) {
 		if (newbie) {
-			this.newbieTask = new NewbieTask(this, 0);
+			this.newbieTask = new NewbieTask(this, time);
 		} else if (this.newbie && newbieTask != null) {
 			newbieTask.cancel();
 			this.newbieTask = null;
@@ -406,13 +411,15 @@ private void initializeNameTag() {
 	 */
 	public void applyPlayerData(final PlayerData data) {
 		// Apply loaded data (overriding defaults)
-		this.pvpState = data.isPvpEnabled();
+		this.pvpState = data.isPvpEnabled() || CombatUtils.isNPC(getPlayer());
 		this.toggleTime = data.getToggleTime();
 		this.newbie = data.isNewbie();
 
-		// Handle newbie task if needed
-		if (this.newbie && data.getNewbieTimeLeft() > 0) {
-			this.newbieTask = new NewbieTask(this, data.getNewbieTimeLeft());
+		if (Conf.NEWBIE_ENABLED.asBool() && (this.newbie && data.getNewbieTimeLeft() > 0 || !getPlayer().hasPlayedBefore())) {
+			setNewbie(true, data.getNewbieTimeLeft());
+		} else if (!Conf.NEWBIE_ENABLED.asBool() && this.newbie) {
+			// If newbie protection is disabled but player has newbie flag, clear it
+			setNewbie(false);
 		}
 
 		// Apply world-specific PvP rules (these override database values)

pvpmanager/src/main/java/me/chancesd/pvpmanager/player/PlayerData.java

@@ -3,6 +3,7 @@
 import java.util.Map;
 import java.util.UUID;
 
+import me.chancesd.pvpmanager.setting.Conf;
 import me.chancesd.pvpmanager.storage.fields.UserDataFields;
 import me.chancesd.pvpmanager.utils.CombatUtils;
 
@@ -104,7 +105,7 @@ public static PlayerData fromMap(Map<String, Object> userData) {
      * Creates default PlayerData for new players
      */
     public static PlayerData createDefault() {
-        return new PlayerData(null, null, null, false, 0, false, 0, System.currentTimeMillis());
+        return new PlayerData(null, null, null, Conf.DEFAULT_PVP.asBool(), 0, false, 0, System.currentTimeMillis());
     }
 
     /**

pvpmanager/src/main/java/me/chancesd/pvpmanager/setting/Conf.java

@@ -317,7 +317,7 @@ public static void initialize(final PvPManager pl, final YamlConfiguration yamlC
 			try {
 				setting.loadSetting();
 			} catch (final Exception ex) {
-				Log.severe("Error loading the seetings for " + setting.section + "." + setting.configKey, ex);
+				Log.severe("Error loading settings for " + setting.section + "." + setting.configKey, ex);
 			}
 		});
 		Log.infoColor(ChatColor.GREEN + "Using player nametags: " + ChatColor.AQUA + (NAMETAG_COMBAT_ENABLED.asBool() || TOGGLE_NAMETAG_ENABLED.asBool()));
@@ -327,7 +327,7 @@ private static <R extends Enum<R>> R loadEnum(final Class<R> clazz, final String
 		try {
 			return Enum.valueOf(clazz, value);
 		} catch (final IllegalArgumentException e) {
-			Log.warning("Error! " + clazz.getSimpleName() + " '" + value + "' does not exist!");
+			Log.warning("Error! " + clazz.getSimpleName() + " '" + value + "' does not exist! Check your config");
 			return null;
 		}
 	}

pvpmanager/src/main/resources/config.yml

@@ -50,7 +50,7 @@ Combat Tag:
     Boss Bar:
       Enabled: true
       # You can use any PlaceholderAPI placeholders here
-      Message: '&8&l[&c&lIn Combat&8&l] &e&l<time> seconds'
+      Message: '&8&l[&c&lCOMBAT&8&l] &e&l<time> seconds'
       # See here for bar color options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarColor.html
       BarColor: RED
       # See here for bar style options - https://hub.spigotmc.org/javadocs/spigot/org/bukkit/boss/BarStyle.html
@@ -86,6 +86,8 @@ Combat Tag:
         - 'BUTTON'
         - 'BED'
         - 'PRESSURE_PLATE'
+        - 'SLAB'
+        - 'STAIRS'
         - 'CARPET'
     # Command whitelist is recursive, allowing 'tell' will allow 'tell' with any number of arguments
     Commands:
@@ -120,7 +122,7 @@ Combat Log Punishments:
   # List of commands to execute on combat log, use '{player}' for player name
   # The 'announce' command can be optionally used to broadcast, you can add more or to disable just delete the command
   Commands On Combat Log:
-    - 'announce {prefix} {player} tried to escape combat and died!'
+    - 'announce #bf973f{prefix} {player} #361010tried to escape combat!'
 
 ######################
 ####  PvP Toggle  ####
@@ -299,8 +301,8 @@ Database:
 # PlaceholderAPI boolean formatting
 Placeholders:
   Boolean Format:
-    True: '&a✓'
-    False: '&c✗'
+    True: '#6fc93e✓'
+    False: '#c9453e✗'
 
 # Should PvPManager be allowed to check for updates and tell you about them
 # Auto Update - After checking should the update be downloaded automatically for you?

pvpmanager/src/main/resources/locale/messages.properties

@@ -10,16 +10,16 @@ Prefix = &#992222&lPvP &#FF5555➤
 # PvP Toggle
 PvP_Disabled = {prefix} &aPvP disabled! You are now protected
 PvP_Enabled = {prefix} &cPvP enabled! You can now attack and be attacked
-Attack_Denied_You = {prefix} &#CC5555You have PvP protection!
-Attack_Denied_Other = {prefix} &f{player} &#CC5555has PvP protection!
+Attack_Denied_You = {prefix} &#c9453eYou have PvP protection!
+Attack_Denied_Other = {prefix} &f{player} &#c9453ehas PvP protection!
 PvP_Force_Enabled_WorldGuard = {prefix} &6PvP protection disabled in this PvP region
 PvP_Disabled_Fee = {prefix} &aYou paid a &#FFD700{money} &afee for having PvP disabled
 PvP_Disabled_Fee_Not_Enough = {prefix} &6PvP protection disabled - insufficient funds for the fee
 
 # Combat Tag
 Tagged_Attacker = {prefix} &7You tagged &f{player}&7! Do not log out!
 Tagged_Defender = {prefix} &7Tagged by &f{player}&7! Do not log out!
-Out_Of_Combat = {prefix} &aYou are no longer in combat.
+Out_Of_Combat = {prefix} &aYou are no longer in combat
 Out_Of_Combat_ActionBar = &aYou are no longer in combat
 Command_Denied_InCombat = {prefix} &cCommand denied! You are still in combat!
 Block_Place_Blocked_InCombat = {prefix} &cYou can't place blocks while in combat!
@@ -34,32 +34,32 @@ Interact_Blocked_InCombat = {prefix} &cYou can't right-click while in combat!
 Teleport_Blocked_InCombat = {prefix} &cYou can't teleport while in combat!
 Totem_Blocked_InCombat = {prefix} &cTotems of undying are blocked while in combat!
 Inventory_Blocked_InCombat = {prefix} &cYou can't open an inventory while in combat!
-Pushback_Warning = {prefix} &#CC5555You can't run away to safezones while in combat!
+Pushback_Warning = {prefix} &#c9453eYou can't run away to safezones while in combat!
 
 # Newbie Protection
 Newbie_Protection = {prefix} &aWelcome! You are protected against PvP for &e{time}
 Newbie_Protection_End = {prefix} &6Your PvP protection expired! You can be attacked!
 Newbie_Protection_Removed = {prefix} &aYou removed your PvP protection! Be careful
-Newbie_Protection_On_Hit = {prefix} &#CC5555You have PvP protection! If you really want to do PvP, remove it with &f/newbie disable
-Newbie_Protection_Attacker = {prefix} &#CC5555&f{player} &#CC5555has Newbie protection!
+Newbie_Protection_On_Hit = {prefix} &#c9453eYou have PvP protection! If you really want to do PvP, remove it with &f/newbie disable
+Newbie_Protection_Attacker = {prefix} &#c9453e&f{player} &#c9453ehas Newbie protection!
 Newbie_Time_Check = {prefix} &7You are protected from PvP for &e{time}
 Newbie_Time_Check_Other = {prefix} &7&f{player} &7is protected from PvP for another &e{time}
 Newbie_Command_Blocked = {prefix} &cYou cannot use this command while you have Newbie protection!
 Newbie_Pickup_Items_Blocked = {prefix} &cYou can't pickup items while you have Newbie protection!
 Newbie_Force_Removed_WorldGuard = {prefix} &6Your new player protection was removed for being inside a PvP region
 
 # Respawn Protection
-Respawn_Protection = {prefix} &#CC5555You have respawn protection!
-Respawn_Protection_Other = {prefix} &#CC5555&f{player} &#CC5555has respawn protection!
+Respawn_Protection = {prefix} &#c9453eYou have respawn protection!
+Respawn_Protection_Other = {prefix} &#c9453e&f{player} &#c9453ehas respawn protection!
 
 # World Protection
-World_Protection = {prefix} &#CC5555PvP is disabled in this world!
+World_Protection = {prefix} &#c9453ePvP is disabled in this world!
 
 # AFK Protection
-AFK_Protection = {prefix} &#CC5555This player can't be attacked while AFK
+AFK_Protection = {prefix} &#c9453eThis player can't be attacked while AFK
 
 # Global Protection
-Global_Protection = {prefix} &#CC5555PvP combat is globally disabled
+Global_Protection = {prefix} &#c9453ePvP combat is globally disabled
 
 # Player Kills
 Money_Reward = {prefix} &aYou got &#FFD700{money} &acoins for killing player &f{victim}&a!
@@ -112,8 +112,8 @@ Tag_Timeleft = &7You are in combat for another &e{time}
 Tag_Not_In_Combat = &7You are currently not in combat
 
 # Variables
-Enabled = &aEnabled
-Disabled = &cDisabled
+Enabled = #6fc93eEnabled
+Disabled = #c9453eDisabled
 # The times below are what will show wherever {time} is used
 Time_Days = days
 Time_Hours = hours

pvpmanager/src/main/resources/locale/messages_ar.properties

@@ -10,8 +10,8 @@ Prefix = &\#992222&lPvP &\#FF5555➤
 # PvP Toggle
 PvP_Disabled = {prefix} &aPvP disabled\! You are now protected
 PvP_Enabled = {prefix} &cPvP enabled\! You can now attack and be attacked
-Attack_Denied_You = {prefix} &\#CC5555You have PvP protection\!
-Attack_Denied_Other = {prefix} &f{player} &\#CC5555has PvP protection\!
+Attack_Denied_You = {prefix} &#c9453eYou have PvP protection\!
+Attack_Denied_Other = {prefix} &f{player} &#c9453ehas PvP protection\!
 PvP_Force_Enabled_WorldGuard = {prefix} &6PvP force enabled because you are inside a PvP region
 PvP_Disabled_Fee = {prefix} &aYou paid a &\#FFD700{money} &afee for having PvP disabled
 PvP_Disabled_Fee_Not_Enough = {prefix} &6PvP enabled because you don''t have enough money
@@ -40,26 +40,26 @@ Pushback_Warning = &cYou can't run away to safezones while in combat\!
 Newbie_Protection = {prefix} &aWelcome\! You are protected against PvP for&a {time}&a minutes
 Newbie_Protection_End = {prefix} &6Your PvP protection has expired\! You can now be attacked\!
 Newbie_Protection_Removed = {prefix} &aYou removed your PvP protection\! Be careful
-Newbie_Protection_On_Hit = {prefix} &\#CC5555You have PvP protection\! If you really want to do PvP, remove it with &f/newbie disable
-Newbie_Protection_Attacker = {prefix} &\#CC5555&f{player} &\#CC5555has Newbie protection\!
+Newbie_Protection_On_Hit = {prefix} &#c9453eYou have PvP protection\! If you really want to do PvP, remove it with &f/newbie disable
+Newbie_Protection_Attacker = {prefix} &#c9453e&f{player} &#c9453ehas Newbie protection\!
 Newbie_Time_Check = {prefix} &7You are protected from PvP for &e{time}
 Newbie_Time_Check_Other = {prefix} &7&f{player} &7is protected from PvP for another &e{time}
 Newbie_Command_Blocked = {prefix} &cYou cannot use this command while you have newbie protection\!
 Newbie_Pickup_Items_Blocked = {prefix} &cYou can''t pickup items while you have newbie protection
 Newbie_Force_Removed_WorldGuard = {prefix} &6Your new player protection was removed for being inside a PvP region
 
 # Respawn Protection
-Respawn_Protection = {prefix} &\#CC5555You have respawn protection\!
-Respawn_Protection_Other = {prefix} &\#CC5555&f{player} &\#CC5555has respawn protection\!
+Respawn_Protection = {prefix} &#c9453eYou have respawn protection\!
+Respawn_Protection_Other = {prefix} &#c9453e&f{player} &#c9453ehas respawn protection\!
 
 # World Protection
-World_Protection = {prefix} &\#CC5555PvP is disabled in this world\!
+World_Protection = {prefix} &#c9453ePvP is disabled in this world\!
 
 # AFK Protection
-AFK_Protection = {prefix} &\#CC5555This player can''t be attacked while AFK
+AFK_Protection = {prefix} &#c9453eThis player can''t be attacked while AFK
 
 # Global Protection
-Global_Protection = {prefix} &\#CC5555PvP combat is globally disabled
+Global_Protection = {prefix} &#c9453ePvP combat is globally disabled
 
 # Player Kills
 Money_Reward = &aYou got &\#FFD700{money} &acoins for killing player &f{victim} &a\!

pvpmanager/src/main/resources/locale/messages_bg.properties

@@ -10,8 +10,8 @@ Prefix = &\#992222&lPvP &\#FF5555➤
 # PvP Toggle
 PvP_Disabled = {prefix} &aPvP disabled\! You are now protected
 PvP_Enabled = {prefix} &cPvP enabled\! You can now attack and be attacked
-Attack_Denied_You = {prefix} &\#CC5555Вие имате PvP защита\!
-Attack_Denied_Other = {prefix} &f{player} &\#CC5555има PvP защита\!
+Attack_Denied_You = {prefix} &#c9453eВие имате PvP защита\!
+Attack_Denied_Other = {prefix} &f{player} &#c9453eима PvP защита\!
 PvP_Force_Enabled_WorldGuard = {prefix} &6PvP принудително активирано, защото сте в PvP регион
 PvP_Disabled_Fee = {prefix} &aПлатихте такса от &\#FFD700{money} &aза деактивиране на PvP
 PvP_Disabled_Fee_Not_Enough = {prefix} &6PvP enabled because you don''t have enough money
@@ -40,26 +40,26 @@ Pushback_Warning = &cНе можете да бягате към безопасн
 Newbie_Protection = {prefix} &aДобре дошли\! Вие сте защитени срещу PvP за&a {time}&a минути
 Newbie_Protection_End = {prefix} &6Вашата PvP защита изтече\! Вече може да бъдете атакувани\!
 Newbie_Protection_Removed = {prefix} &aПремахнахте вашата PvP защита\! Бъдете внимателни
-Newbie_Protection_On_Hit = {prefix} &\#CC5555You have PvP protection\! If you really want to do PvP, remove it with &f/newbie disable
-Newbie_Protection_Attacker = {prefix} &\#CC5555&f{player} &\#CC5555has Newbie protection\!
+Newbie_Protection_On_Hit = {prefix} &#c9453eYou have PvP protection\! If you really want to do PvP, remove it with &f/newbie disable
+Newbie_Protection_Attacker = {prefix} &#c9453e&f{player} &#c9453ehas Newbie protection\!
 Newbie_Time_Check = {prefix} &7Вие сте защитени от PvP за &e{time}
 Newbie_Time_Check_Other = {prefix} &7&f{player} &7е защитен от PvP за още &e{time}
 Newbie_Command_Blocked = {prefix} &cНе можете да използвате тази команда, докато имате защита за новаци\!
 Newbie_Pickup_Items_Blocked = {prefix} &cНе можете да взимате предмети, докато имате защита за новаци
 Newbie_Force_Removed_WorldGuard = {prefix} &6Вашата защита за нови играчи беше премахната, защото сте в PvP регион
 
 # Respawn Protection
-Respawn_Protection = {prefix} &\#CC5555Имате защита при прераждане\!
-Respawn_Protection_Other = {prefix} &\#CC5555&f{player} &\#CC5555има защита при прераждане\!
+Respawn_Protection = {prefix} &#c9453eИмате защита при прераждане\!
+Respawn_Protection_Other = {prefix} &#c9453e&f{player} &#c9453eима защита при прераждане\!
 
 # World Protection
-World_Protection = {prefix} &\#CC5555PvP е изключено в този свят\!
+World_Protection = {prefix} &#c9453ePvP е изключено в този свят\!
 
 # AFK Protection
-AFK_Protection = {prefix} &\#CC5555Този играч не може да бъде атакуван, докато е AFK
+AFK_Protection = {prefix} &#c9453eТози играч не може да бъде атакуван, докато е AFK
 
 # Global Protection
-Global_Protection = {prefix} &\#CC5555PvP битката е глобално деактивирана
+Global_Protection = {prefix} &#c9453ePvP битката е глобално деактивирана
 
 # Player Kills
 Money_Reward = &aYou got &\#FFD700{money} &acoins for killing player &f{victim} &a\!