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

less duplication in games

Browse Source
This commit is contained in:
UnknownShadow200 2018-06-25 11:10:37 +10:00
parent 10465903fe
commit 699422d137
7 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MCGalaxy/Games/CTF/CtfGame.Plugin.cs
View File

@ -143,10 +143,8 @@ namespace MCGalaxy.Games {
void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) { void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) {
HandleJoinedCommon(p, prevLevel, level, ref announce); HandleJoinedCommon(p, prevLevel, level, ref announce);
if (prevLevel == Map && level != Map) {
PlayerLeftGame(p);
} else if (level != Map) { return; }
if (level != Map) return;
MessageMapInfo(p); MessageMapInfo(p);
if (TeamOf(p) != null) return; if (TeamOf(p) != null) return;

3
MCGalaxy/Games/CTF/CtfGame.cs
View File

@ -42,7 +42,6 @@ namespace MCGalaxy.Games {
public VolatileArray<Player> Members = new VolatileArray<Player>(); public VolatileArray<Player> Members = new VolatileArray<Player>();
public CtfTeam(string name, string color) { Name = name; Color = color; } public CtfTeam(string name, string color) { Name = name; Color = color; }
public bool Remove(Player p) { return Members.Remove(p); }
public void RespawnFlag(Level lvl) { public void RespawnFlag(Level lvl) {
Vec3U16 pos = FlagPos; Vec3U16 pos = FlagPos;
@ -148,7 +147,7 @@ namespace MCGalaxy.Games {
if (team == null) return; if (team == null) return;
DropFlag(p, team); DropFlag(p, team);
team.Remove(p); team.Members.Remove(p);
Map.Message(team.Color + p.DisplayName + " %Sleft CTF"); Map.Message(team.Color + p.DisplayName + " %Sleft CTF");
} }

2
MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs
View File

@ -70,7 +70,7 @@ namespace MCGalaxy.Games {
} }
void HandleOnJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) { void HandleOnJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) {
if (prevLevel == Map && level != Map) { PlayerLeftGame(p); } HandleJoinedCommon(p, prevLevel, level, ref announce);
} }
} }
} }

2
MCGalaxy/Games/LavaSurvival/LSGame.Plugin.cs
View File

@ -42,8 +42,8 @@ namespace MCGalaxy.Games {
void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) { void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) {
HandleJoinedCommon(p, prevLevel, level, ref announce); HandleJoinedCommon(p, prevLevel, level, ref announce);
if (Map != level) return;
if (Map != level) return;
MessageMapInfo(p); MessageMapInfo(p);
if (RoundInProgress) OutputStatus(p); if (RoundInProgress) OutputStatus(p);
} }

2
MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs
View File

@ -38,6 +38,8 @@ namespace MCGalaxy.Games {
protected void HandleJoinedCommon(Player p, Level prevLevel, Level level, ref bool announce) { protected void HandleJoinedCommon(Player p, Level prevLevel, Level level, ref bool announce) {
if (prevLevel == Map && level != Map) { if (prevLevel == Map && level != Map) {
if (Picker.Voting) Picker.ResetVoteMessage(p); if (Picker.Voting) Picker.ResetVoteMessage(p);
ResetHUD(p);
PlayerLeftGame(p);
} else if (level == Map) { } else if (level == Map) {
if (Picker.Voting) Picker.SendVoteMessage(p); if (Picker.Voting) Picker.SendVoteMessage(p);
} }

2
MCGalaxy/Games/ZombieSurvival/ZSGame.DB.cs
View File

@ -120,7 +120,7 @@ namespace MCGalaxy.Games {
protected override void SaveStats(Player p) { protected override void SaveStats(Player p) {
ZSData data = TryGet(p); ZSData data = TryGet(p);
if (data == null || data.TotalRoundsSurvived == 0 && data.TotalInfected == 0) return; if (data == null || (data.TotalRoundsSurvived == 0 && data.TotalInfected == 0)) return;
int count = Database.CountRows("ZombieStats", "WHERE Name=@0", p.name); int count = Database.CountRows("ZombieStats", "WHERE Name=@0", p.name);
if (count == 0) { if (count == 0) {

6
MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs
View File

@ -127,11 +127,7 @@ namespace MCGalaxy.Games {
void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) { void HandleJoinedLevel(Player p, Level prevLevel, Level level, ref bool announce) {
HandleJoinedCommon(p, prevLevel, level, ref announce); HandleJoinedCommon(p, prevLevel, level, ref announce);
p.SetPrefix(); // TODO: Kinda hacky, not sure if needed p.SetPrefix(); // TODO: Kinda hacky, not sure if needed
if (level != Map) return;
if (prevLevel == Map && level != Map) {
ResetHUD(p);
if (RoundInProgress) PlayerLeftGame(p);
} else if (level != Map) { return; }
ZSData data = Get(p); ZSData data = Get(p);
p.SetPrefix(); p.SetPrefix();