Change classicgen to use still lava/water instead of active lava/wate…

…r, to match original classic Also when executing commands from discord/IRC, add a space between service type and username for 'fake player' database ID i.e. fixes when doing /up from Discord/IRC, that /b in-game doesn't show a space between 'Discord/IRC' and username
ClassiCube · Mar 12, 2022 · bbe5016 · bbe5016
1 parent 262cef5
commit bbe5016
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/MCGalaxy/Generator/Classic/ClassicGenerator.cs b/MCGalaxy/Generator/Classic/ClassicGenerator.cs
@@ -232,7 +232,7 @@ public sealed partial class ClassicGenerator {
             for (int i = 0; i < numSources; i++) {
                 int x = rnd.Next(Width), z = rnd.Next(Length);
                 int y = waterLevel - rnd.Next(1, 3);
-                FloodFill((y * Length + z) * Width + x, Block.Water);
+                FloodFill((y * Length + z) * Width + x, Block.StillWater);
             }
         }
 
@@ -243,7 +243,7 @@ public sealed partial class ClassicGenerator {
             for (int i = 0; i < numSources; i++) {
                 int x = rnd.Next(Width), z = rnd.Next(Length);
                 int y = (int)((waterLevel - 3) * rnd.NextFloat() * rnd.NextFloat());
-                FloodFill((y * Length + z) * Width + x, Block.Lava);
+                FloodFill((y * Length + z) * Width + x, Block.StillLava);
             }
         }
 

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs b/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs
@@ -19,11 +19,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Threading;
 using MCGalaxy.Config;
-using MCGalaxy.Events.GroupEvents;
 using MCGalaxy.Events.PlayerEvents;
-using MCGalaxy.Events.ServerEvents;
 using MCGalaxy.Util;
 
 namespace MCGalaxy.Modules.Relay.Discord 

diff --git a/MCGalaxy/Modules/Relay/RelayBot.cs b/MCGalaxy/Modules/Relay/RelayBot.cs
@@ -516,7 +516,7 @@ protected sealed class RelayPlayer : Player {
                 Bot     = bot;
 
                 if (user != null) {
-                    string nick = "(" + bot.RelayName + user.Nick + ")";
+                    string nick = "(" + bot.RelayName + " " + user.Nick + ")";
                     DatabaseID = NameConverter.InvalidNameID(nick);
                 }
                 SuperName = bot.RelayName;