Merge remote-tracking branch 'origin/community' into community

configs/config.ini

@@ -1,63 +1,84 @@
+;
+; # This is a template config.ini file.
+; # Modify howhever you see fit.
+;
+; # Community branch (recommended): https://github.com/blizzless/blizzless-diiis/tree/community
+; # test-stable branch: https://github.com/blizzless/blizzless-diiis/
+; # Master branch: https://github.com/blizzless/blizzless-diiis/tree/master
+;
+
 ; Settings for Bnet
 [Battle-Server]
 Enabled = true
-BindIP = 127.0.0.1
+BindIP = 192.168.0.22
 WebPort = 9800
 Port = 1119
 BindIPv6 = ::1
-MOTD = Welcome to Diablo 3!
+MotdEnabled = true
+Motd = Welcome to Diablo 3!
 
-[IWServer]
+; ------------------------
-IWServer = false
+; [IWServer]
+; IWServer = false
 
-; Settings for REST
+; ------------------------
+; REST services for login (and others)
 [REST]
-IP = 127.0.0.1
+IP = 51.79.41.162
 Public = true
-PublicIP = 127.0.0.1
+PublicIP = 192.168.0.22
 PORT = 80
 
-; Settings for game
+; ------------------------
+; Game server options and game-mods.
 [Game-Server]
 Enabled = true
 CoreActive = true
-BindIP = 127.0.0.1
+BindIP = 192.168.0.22
-WebPort = 9100
+WebPort = 9001
-Port = 2001
+Port = 1345
 BindIPv6 = ::1
 DRLGemu = true
-;Modding of game
+; Modding of game
 RateExp = 1
 RateMoney = 1
 RateDrop = 1
 RateChangeDrop = 1
 RateMonsterHP = 1
 RateMonsterDMG = 1
+; Percentage that a unique, legendary, set or special item created is unidentified
 ChanceHighQualityUnidentified = 30
+; Percentage that normal item created is unidentified
 ChanceNormalUnidentified = 5
+; Amount of times user can resurrect at corpse
 ResurrectionCharges = 3
 
+; ------------------------
+; Network address translation
 [NAT]
-Enabled = False
+Enabled = True
-PublicIP = 127.0.0.1
+; use your public IP
+PublicIP = 192.168.0.22
+
+; ------------------------
+; Where the outputs should be.
+; Best for visualization (default): AnsiLog (target: Ansi)
+; Best for debugging: ConsoleLog (target: console)
+; Best for packet analysis: PacketLog (target: file)
+[AnsiLog]
+Enabled = true
+Target = Ansi
+IncludeTimeStamps = true
+MinimumLevel = Debug
+MaximumLevel = Fatal
 
-; Use Ansi Log if you want a cleaner log view, otherwise, use ConsoleLog, which keeps the screen logs.
 [ConsoleLog]
 Enabled = false
 Target = Console
 IncludeTimeStamps = true
 MinimumLevel = Debug
-MaximumLevel = Fatal
+MaximumLevel = PacketDump
 
-; Ansi Log - enabled by default - useful if you're not in a hard-debug mode. It's easier to view logs.
-[AnsiLog]
-Enabled = true
-Target = Ansi
-IncludeTimeStamps = true
-MinimumLevel = Info
-MaximumLevel = Fatal
-
-; dumps everything from Debug to PacketDump (packet logs) to a file
 [PacketLog]
 Enabled = true
 Target = file

src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs

@@ -3602,6 +3602,7 @@ public class Player : Actor, IMessageConsumer, IUpdateable
                 });
     }
 
+    private bool _motdSent;
     public override void OnEnter(World world)
     {
         world.Reveal(this);
@@ -3671,7 +3672,8 @@ public class Player : Actor, IMessageConsumer, IUpdateable
 
         System.Threading.Tasks.Task.Delay(3).Wait();
         RevealActorsToPlayer();
-
+        if (!_motdSent && LoginServer.Config.Instance.MotdEnabled)
+            InGameClient.BnetClient.SendMotd();
         //
     }