From d5fd5bc3896404c8903004c1330479a6267bb783 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Mon, 25 Jun 2018 11:15:52 +1000 Subject: [PATCH] combine HandlePlayerDisconnect event handlers --- MCGalaxy/Games/CTF/CtfGame.Plugin.cs | 13 ++----------- MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs | 7 ------- MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs | 7 +++++++ MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs | 6 ------ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/MCGalaxy/Games/CTF/CtfGame.Plugin.cs b/MCGalaxy/Games/CTF/CtfGame.Plugin.cs index d61d81e3c..7e4120583 100644 --- a/MCGalaxy/Games/CTF/CtfGame.Plugin.cs +++ b/MCGalaxy/Games/CTF/CtfGame.Plugin.cs @@ -30,10 +30,8 @@ namespace MCGalaxy.Games { protected override void HookEventHandlers() { OnPlayerDeathEvent.Register(HandlePlayerDeath, Priority.High); OnPlayerChatEvent.Register(HandlePlayerChat, Priority.High); - OnPlayerCommandEvent.Register(HandlePlayerCommand, Priority.High); - + OnPlayerCommandEvent.Register(HandlePlayerCommand, Priority.High); OnBlockChangeEvent.Register(HandleBlockChange, Priority.High); - OnPlayerDisconnectEvent.Register(HandleDisconnect, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnTabListEntryAddedEvent.Register(HandleTabListEntryAdded, Priority.High); @@ -45,10 +43,8 @@ namespace MCGalaxy.Games { protected override void UnhookEventHandlers() { OnPlayerDeathEvent.Unregister(HandlePlayerDeath); OnPlayerChatEvent.Unregister(HandlePlayerChat); - OnPlayerCommandEvent.Unregister(HandlePlayerCommand); - + OnPlayerCommandEvent.Unregister(HandlePlayerCommand); OnBlockChangeEvent.Unregister(HandleBlockChange); - OnPlayerDisconnectEvent.Unregister(HandleDisconnect); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnTabListEntryAddedEvent.Unregister(HandleTabListEntryAdded); @@ -111,11 +107,6 @@ namespace MCGalaxy.Games { } } - void HandleDisconnect(Player p, string reason) { - if (p.level != Map) return; - PlayerLeftGame(p); - } - void HandlePlayerSpawning(Player p, ref Position pos, ref byte yaw, ref byte pitch, bool respawning) { if (p.level != Map) return; CtfTeam team = TeamOf(p); diff --git a/MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs b/MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs index 9db1f5981..d254e740b 100644 --- a/MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs +++ b/MCGalaxy/Games/Countdown/CountdownGame.Plugin.cs @@ -25,7 +25,6 @@ namespace MCGalaxy.Games { protected override void HookEventHandlers() { OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High); - OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnJoinedLevelEvent.Register(HandleOnJoinedLevel, Priority.High); @@ -34,7 +33,6 @@ namespace MCGalaxy.Games { protected override void UnhookEventHandlers() { OnPlayerMoveEvent.Unregister(HandlePlayerMove); - OnPlayerDisconnectEvent.Unregister(HandlePlayerDisconnect); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnJoinedLevelEvent.Unregister(HandleOnJoinedLevel); @@ -57,11 +55,6 @@ namespace MCGalaxy.Games { p.cancelmove = true; } - void HandlePlayerDisconnect(Player p, string reason) { - if (!Players.Contains(p)) return; - PlayerLeftGame(p); - } - void HandlePlayerSpawning(Player p, ref Position pos, ref byte yaw, ref byte pitch, bool respawning) { if (!respawning || !Remaining.Contains(p)) return; Map.Message(p.ColoredName + " %Sis out of countdown!"); diff --git a/MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs b/MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs index 877b7c050..9893fbe10 100644 --- a/MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs +++ b/MCGalaxy/Games/RoundsGame/RoundsGame.Plugin.cs @@ -27,12 +27,19 @@ namespace MCGalaxy.Games { OnLevelUnloadEvent.Register(HandleLevelUnload, Priority.High); OnPlayerActionEvent.Register(HandlePlayerAction, Priority.High); OnSQLSaveEvent.Register(SaveStats, Priority.High); + OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High); } protected virtual void UnhookEventHandlers() { OnLevelUnloadEvent.Unregister(HandleLevelUnload); OnPlayerActionEvent.Unregister(HandlePlayerAction); OnSQLSaveEvent.Unregister(SaveStats); + OnPlayerDisconnectEvent.Unregister(HandlePlayerDisconnect); + } + + protected virtual void HandlePlayerDisconnect(Player p, string reason) { + if (p.level != Map) return; + PlayerLeftGame(p); } protected void HandleJoinedCommon(Player p, Level prevLevel, Level level, ref bool announce) { diff --git a/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs b/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs index ff0c2209d..4ee66031d 100644 --- a/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs +++ b/MCGalaxy/Games/ZombieSurvival/ZSGame.Plugin.cs @@ -38,7 +38,6 @@ namespace MCGalaxy.Games { OnSendingHeartbeatEvent.Register(HandleSendingHeartbeat, Priority.High); OnPlayerConnectEvent.Register(HandlePlayerConnect, Priority.High); - OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High); OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnJoinedLevelEvent.Register(HandleJoinedLevel, Priority.High); @@ -55,7 +54,6 @@ namespace MCGalaxy.Games { OnSendingHeartbeatEvent.Unregister(HandleSendingHeartbeat); OnPlayerConnectEvent.Unregister(HandlePlayerConnect); - OnPlayerDisconnectEvent.Unregister(HandlePlayerDisconnect); OnPlayerMoveEvent.Unregister(HandlePlayerMove); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnJoinedLevelEvent.Unregister(HandleJoinedLevel); @@ -105,10 +103,6 @@ namespace MCGalaxy.Games { Player.Message(p, "&3Zombie Survival %Sis running! Type %T/ZS go %Sto join"); } - void HandlePlayerDisconnect(Player p, string reason) { - PlayerLeftGame(p); - } - void HandlePlayerMove(Player p, Position next, byte rotX, byte rotY) { if (!RoundInProgress || p.level != Map) return;