AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix joining museums after joining a world not causing world to auto-unload, partially addresses #316

Browse Source
This commit is contained in:
UnknownShadow200 2017-05-10 14:12:11 +10:00
parent bfd4042f84
commit 1c3992cbb0
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MCGalaxy/Commands/World/CmdMuseum.cs
View File

@ -62,19 +62,10 @@ namespace MCGalaxy.Commands.World {
Level lvl = IMapImporter.Formats[0].Read(path, name, false); Level lvl = IMapImporter.Formats[0].Read(path, name, false);
lvl.MapName = mapName; lvl.MapName = mapName;
SetLevelProps(lvl); SetLevelProps(lvl);
Level.LoadMetadata(lvl); Level.LoadMetadata(lvl);
if (!lvl.CanJoin(p)) return;
if (!PlayerActions.ChangeMap(p, lvl)) return;
p.Loading = true;
Entities.DespawnEntities(p);
Level oldLevel = p.level;
p.level = lvl;
if (!p.SendRawMap(oldLevel, lvl)) return;
Entities.GlobalSpawn(p, lvl.SpawnPos, lvl.SpawnRot, true);
p.ClearBlockchange(); p.ClearBlockchange();
Chat.MessageGlobal(p, p.ColoredName + " %Swent to the " + lvl.name, false, true);
} }
static void SetLevelProps(Level lvl) { static void SetLevelProps(Level lvl) {

2
MCGalaxy/Player/Player.Login.cs
View File

@ -97,7 +97,7 @@ namespace MCGalaxy {
PlayerInfo.Online.Add(this); PlayerInfo.Online.Add(this);
} }
SendMap(null); SendMap(null);
if (disconnected) return; if (disconnected) return;
loggedIn = true; loggedIn = true;
connections.Remove(this); connections.Remove(this);

3
MCGalaxy/Player/PlayerActions.cs
View File

@ -112,7 +112,8 @@ namespace MCGalaxy {
CheckGamesJoin(p, oldLevel); CheckGamesJoin(p, oldLevel);
if (p.level.ShouldShowJoinMessage(oldLevel)) { if (p.level.ShouldShowJoinMessage(oldLevel)) {
Chat.MessageGlobal(p, p.ColoredName + " %Swent to " + lvl.ColoredName, false, true); string msg = p.level.IsMuseum ? "%Swent to the " : "%Swent to ";
Chat.MessageGlobal(p, p.ColoredName + " %Swent " + lvl.ColoredName, false, true);
Player.RaisePlayerAction(p, PlayerAction.JoinWorld, lvl.name); Player.RaisePlayerAction(p, PlayerAction.JoinWorld, lvl.name);
} }
return true; return true;