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

combine HandlePlayerDisconnect event handlers

Browse Source
This commit is contained in:
UnknownShadow200 2018-06-25 11:15:52 +10:00
parent 699422d137
commit d5fd5bc389
4 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,9 +31,7 @@ namespace MCGalaxy.Games {
OnPlayerDeathEvent.Register(HandlePlayerDeath, Priority.High); OnPlayerDeathEvent.Register(HandlePlayerDeath, Priority.High);
OnPlayerChatEvent.Register(HandlePlayerChat, Priority.High); OnPlayerChatEvent.Register(HandlePlayerChat, Priority.High);
OnPlayerCommandEvent.Register(HandlePlayerCommand, Priority.High); OnPlayerCommandEvent.Register(HandlePlayerCommand, Priority.High);
OnBlockChangeEvent.Register(HandleBlockChange, Priority.High); OnBlockChangeEvent.Register(HandleBlockChange, Priority.High);
OnPlayerDisconnectEvent.Register(HandleDisconnect, Priority.High);
OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High);
OnTabListEntryAddedEvent.Register(HandleTabListEntryAdded, Priority.High); OnTabListEntryAddedEvent.Register(HandleTabListEntryAdded, Priority.High);
@ -46,9 +44,7 @@ namespace MCGalaxy.Games {
OnPlayerDeathEvent.Unregister(HandlePlayerDeath); OnPlayerDeathEvent.Unregister(HandlePlayerDeath);
OnPlayerChatEvent.Unregister(HandlePlayerChat); OnPlayerChatEvent.Unregister(HandlePlayerChat);
OnPlayerCommandEvent.Unregister(HandlePlayerCommand); OnPlayerCommandEvent.Unregister(HandlePlayerCommand);
OnBlockChangeEvent.Unregister(HandleBlockChange); OnBlockChangeEvent.Unregister(HandleBlockChange);
OnPlayerDisconnectEvent.Unregister(HandleDisconnect);
OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning);
OnTabListEntryAddedEvent.Unregister(HandleTabListEntryAdded); 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) { void HandlePlayerSpawning(Player p, ref Position pos, ref byte yaw, ref byte pitch, bool respawning) {
if (p.level != Map) return; if (p.level != Map) return;
CtfTeam team = TeamOf(p); CtfTeam team = TeamOf(p);

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

@ -25,7 +25,6 @@ namespace MCGalaxy.Games {
protected override void HookEventHandlers() { protected override void HookEventHandlers() {
OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High); OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High);
OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High);
OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High);
OnJoinedLevelEvent.Register(HandleOnJoinedLevel, Priority.High); OnJoinedLevelEvent.Register(HandleOnJoinedLevel, Priority.High);
@ -34,7 +33,6 @@ namespace MCGalaxy.Games {
protected override void UnhookEventHandlers() { protected override void UnhookEventHandlers() {
OnPlayerMoveEvent.Unregister(HandlePlayerMove); OnPlayerMoveEvent.Unregister(HandlePlayerMove);
OnPlayerDisconnectEvent.Unregister(HandlePlayerDisconnect);
OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning);
OnJoinedLevelEvent.Unregister(HandleOnJoinedLevel); OnJoinedLevelEvent.Unregister(HandleOnJoinedLevel);
@ -57,11 +55,6 @@ namespace MCGalaxy.Games {
p.cancelmove = true; 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) { void HandlePlayerSpawning(Player p, ref Position pos, ref byte yaw, ref byte pitch, bool respawning) {
if (!respawning || !Remaining.Contains(p)) return; if (!respawning || !Remaining.Contains(p)) return;
Map.Message(p.ColoredName + " %Sis out of countdown!"); Map.Message(p.ColoredName + " %Sis out of countdown!");

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

@ -27,12 +27,19 @@ namespace MCGalaxy.Games {
OnLevelUnloadEvent.Register(HandleLevelUnload, Priority.High); OnLevelUnloadEvent.Register(HandleLevelUnload, Priority.High);
OnPlayerActionEvent.Register(HandlePlayerAction, Priority.High); OnPlayerActionEvent.Register(HandlePlayerAction, Priority.High);
OnSQLSaveEvent.Register(SaveStats, Priority.High); OnSQLSaveEvent.Register(SaveStats, Priority.High);
OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High);
} }
protected virtual void UnhookEventHandlers() { protected virtual void UnhookEventHandlers() {
OnLevelUnloadEvent.Unregister(HandleLevelUnload); OnLevelUnloadEvent.Unregister(HandleLevelUnload);
OnPlayerActionEvent.Unregister(HandlePlayerAction); OnPlayerActionEvent.Unregister(HandlePlayerAction);
OnSQLSaveEvent.Unregister(SaveStats); 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) { protected void HandleJoinedCommon(Player p, Level prevLevel, Level level, ref bool announce) {

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

@ -38,7 +38,6 @@ namespace MCGalaxy.Games {
OnSendingHeartbeatEvent.Register(HandleSendingHeartbeat, Priority.High); OnSendingHeartbeatEvent.Register(HandleSendingHeartbeat, Priority.High);
OnPlayerConnectEvent.Register(HandlePlayerConnect, Priority.High); OnPlayerConnectEvent.Register(HandlePlayerConnect, Priority.High);
OnPlayerDisconnectEvent.Register(HandlePlayerDisconnect, Priority.High);
OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High); OnPlayerMoveEvent.Register(HandlePlayerMove, Priority.High);
OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High); OnPlayerSpawningEvent.Register(HandlePlayerSpawning, Priority.High);
OnJoinedLevelEvent.Register(HandleJoinedLevel, Priority.High); OnJoinedLevelEvent.Register(HandleJoinedLevel, Priority.High);
@ -55,7 +54,6 @@ namespace MCGalaxy.Games {
OnSendingHeartbeatEvent.Unregister(HandleSendingHeartbeat); OnSendingHeartbeatEvent.Unregister(HandleSendingHeartbeat);
OnPlayerConnectEvent.Unregister(HandlePlayerConnect); OnPlayerConnectEvent.Unregister(HandlePlayerConnect);
OnPlayerDisconnectEvent.Unregister(HandlePlayerDisconnect);
OnPlayerMoveEvent.Unregister(HandlePlayerMove); OnPlayerMoveEvent.Unregister(HandlePlayerMove);
OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning); OnPlayerSpawningEvent.Unregister(HandlePlayerSpawning);
OnJoinedLevelEvent.Unregister(HandleJoinedLevel); OnJoinedLevelEvent.Unregister(HandleJoinedLevel);
@ -105,10 +103,6 @@ namespace MCGalaxy.Games {
Player.Message(p, "&3Zombie Survival %Sis running! Type %T/ZS go %Sto join"); 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) { void HandlePlayerMove(Player p, Position next, byte rotX, byte rotY) {
if (!RoundInProgress || p.level != Map) return; if (!RoundInProgress || p.level != Map) return;