mirror of
https://github.com/Gurge44/EndlessHostRoles.git
synced 2026-10-19 15:51:58 +00:00
outfit changing is back
This commit is contained in:
1 parent
aa4ad93704
commit
c614f13aae
17 files changed
+170
-86
No files matched your search
@@ -851,7 +851,7 @@ public static class BedWars
|
||||
NameNotifyManager.Notifies.Remove(pc.PlayerId);
|
||||
RPC.PlaySoundRPC(pc.PlayerId, Sounds.TaskComplete);
|
||||
pc.ReviveFromTemporaryExile();
|
||||
if (GameStates.CurrentServerType != GameStates.ServerType.Vanilla) pc.RpcSetColor(Team.GetColorId());
|
||||
pc.RpcChangeColor(Team.GetColorId());
|
||||
pc.TP(Base.SpawnPosition);
|
||||
pc.SetChatVisible(true);
|
||||
Utils.NotifyRoles(SpecifyTarget: pc, SendOption: SendOption.None);
|
||||
|
||||
@@ -363,8 +363,6 @@ public static class CaptureTheFlag
|
||||
int blueCount = players.Count / 2;
|
||||
HashSet<byte> bluePlayers = [];
|
||||
HashSet<byte> yellowPlayers = [];
|
||||
|
||||
bool vanillaServer = GameStates.CurrentServerType == GameStates.ServerType.Vanilla;
|
||||
|
||||
for (var i = 0; i < blueCount; i++)
|
||||
{
|
||||
@@ -372,7 +370,7 @@ public static class CaptureTheFlag
|
||||
players.Remove(player);
|
||||
PlayerTeams[player.PlayerId] = CTFTeam.Blue;
|
||||
bluePlayers.Add(player.PlayerId);
|
||||
if (!vanillaServer) player.RpcSetColor(1);
|
||||
player.RpcChangeColor(1);
|
||||
yield return WaitFrameIfNecessary();
|
||||
}
|
||||
|
||||
@@ -380,7 +378,7 @@ public static class CaptureTheFlag
|
||||
{
|
||||
PlayerTeams[player.PlayerId] = CTFTeam.Yellow;
|
||||
yellowPlayers.Add(player.PlayerId);
|
||||
if (!vanillaServer) player.RpcSetColor(5);
|
||||
player.RpcChangeColor(5);
|
||||
yield return WaitFrameIfNecessary();
|
||||
}
|
||||
|
||||
|
||||
@@ -972,19 +972,13 @@ public static class KingOfTheZones
|
||||
|
||||
yield return null;
|
||||
|
||||
if (GameStates.CurrentServerType != GameStates.ServerType.Vanilla)
|
||||
foreach (PlayerControl player in Main.EnumerateAlivePlayerControls())
|
||||
{
|
||||
foreach (PlayerControl player in Main.EnumerateAlivePlayerControls())
|
||||
try
|
||||
{
|
||||
try
|
||||
{
|
||||
byte colorId = PlayerTeams[player.PlayerId].GetColorId();
|
||||
if (player.CurrentOutfit.ColorId == colorId) continue;
|
||||
|
||||
player.RpcSetColor(colorId);
|
||||
}
|
||||
catch (Exception e) { Utils.ThrowException(e); }
|
||||
player.RpcChangeColor(PlayerTeams[player.PlayerId].GetColorId());
|
||||
}
|
||||
catch (Exception e) { Utils.ThrowException(e); }
|
||||
}
|
||||
|
||||
yield return null;
|
||||
|
||||
@@ -305,10 +305,10 @@ internal static class LoopWanted
|
||||
|
||||
Suffix.Clear();
|
||||
|
||||
Suffix.Append("<color=#ffb432>");
|
||||
Suffix.Append("<#D9BAA5>");
|
||||
Suffix.Append(hud ? GetString("LoopWanted.CurrentTarget") : GetString("Target"));
|
||||
Suffix.Append(":</color> <b>");
|
||||
Suffix.Append(Main.AllPlayerNames.GetValueOrDefault(targetId, GetString("Unknown")));
|
||||
Suffix.Append(": <b>");
|
||||
Suffix.Append(targetId.ColoredPlayerName());
|
||||
Suffix.Append("</b>");
|
||||
|
||||
if (ShowTargetArrow.GetBool())
|
||||
@@ -317,9 +317,11 @@ internal static class LoopWanted
|
||||
Suffix.Append(TargetArrow.GetArrows(seer, targetId));
|
||||
}
|
||||
|
||||
Suffix.Append("</color>");
|
||||
|
||||
if (CarnivalMode)
|
||||
{
|
||||
Suffix.Append("\n<color=#ff6600>");
|
||||
Suffix.Append("\n<#ff6600>");
|
||||
Suffix.Append(GetString("LoopWanted.CarnivalModeHUD"));
|
||||
Suffix.Append("</color>");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user