Merge remote-tracking branch 'origin/master' into feature-petition

2023-08-14 15:43:11 -04:00
parent cf78e6c2a4 1ecf1d4bc2
commit 36be6f3620
3 changed files with 1330 additions and 1272 deletions
@@ -67,6 +67,11 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
        GuildManager.enterWorldMOTD(player);
        ChatManager.sendSystemMessage(player, ConfigManager.MB_WORLD_GREETING.getValue());

+        // Send branch string if available from ConfigManager.
+
+        if (ConfigManager.currentRepoBranch != "")
+            ChatManager.sendSystemMessage(player, ConfigManager.currentRepoBranch);
+
        // Set player mask for QT
        if (player.getRace() != null && player.getRace().getToken() == -524731385)
            player.setObjectTypeMask(MBServerStatics.MASK_PLAYER | MBServerStatics.MASK_UNDEAD);