From 510b010e6d5a517bb07ff52eb6d7871ab1bb1292 Mon Sep 17 00:00:00 2001 From: x07x08 <88050465+x07x08@users.noreply.github.com> Date: Tue, 11 Jul 2023 21:44:50 +0300 Subject: [PATCH] Update 1.9.6 Simplified event fix and added an extra explanation about what it does Changed default bounces to make stuck rockets explode faster Newlines... --- .../EventFix/plugins/TF2DodgeballEventFix.smx | Bin 3482 -> 3084 bytes .../scripting/TF2DodgeballEventFix.sp | 78 ++++++------------ .../NoBlock/plugins/TF2DodgeballNoBlock.smx | Bin 3534 -> 3534 bytes .../NoBlock/scripting/TF2DodgeballNoBlock.sp | 2 +- .../sourcemod/configs/dodgeball/general.cfg | 6 +- 5 files changed, 31 insertions(+), 55 deletions(-) diff --git a/Subplugins/EventFix/plugins/TF2DodgeballEventFix.smx b/Subplugins/EventFix/plugins/TF2DodgeballEventFix.smx index eea4ad1e5d95d27e2d27650316ce3471eb99ac88..8745988de337fe57074a069a69c55223ba83769f 100644 GIT binary patch delta 2910 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 MAHPtWgRzYN0pr9D3;+NC diff --git a/Subplugins/EventFix/scripting/TF2DodgeballEventFix.sp b/Subplugins/EventFix/scripting/TF2DodgeballEventFix.sp index 92afe5b..8fa5df4 100644 --- a/Subplugins/EventFix/scripting/TF2DodgeballEventFix.sp +++ b/Subplugins/EventFix/scripting/TF2DodgeballEventFix.sp @@ -6,7 +6,7 @@ #define PLUGIN_NAME "[TFDB] Event fix" #define PLUGIN_AUTHOR "x07x08" #define PLUGIN_DESCRIPTION "Fixes a very weird issue that happens when unhooking event callbacks..." -#define PLUGIN_VERSION "1.0.1" +#define PLUGIN_VERSION "1.0.2" #define PLUGIN_URL "https://github.com/x07x08/TF2-Dodgeball-Modified" public Plugin myinfo = @@ -29,59 +29,35 @@ public void OnPluginStart() // // Refer to : https://github.com/x07x08/TF2-Dodgeball-Modified/issues/7 - HookEvent("teamplay_round_start", OnRoundStart); - HookEvent("arena_round_start", OnSetupFinished); - HookEvent("teamplay_round_win", OnRoundEnd); - HookEvent("player_spawn", OnPlayerSpawn); - HookEvent("player_death", OnPlayerDeath); - HookEvent("post_inventory_application", OnPlayerInventory); - HookEvent("teamplay_broadcast_audio", OnBroadcastAudio); - HookEvent("object_deflected", OnObjectDeflected); + // https://github.com/alliedmodders/sourcemod/blob/5addaffa5665f353c874f45505914ab692535c24/core/EventManager.cpp#L262 + // + // If n plugins try to unhook the same event (at the same time, like inside OnMapEnd), the last one always fails and + // throws an EventHookErr_NotActive error. + // + // Example : + // Plugins 1, 2 and 3 hook the "player_team" event inside OnConfigsExecuted and unhook it inside OnMapEnd. + // Plugin 3 will always throw (if it was the last one loaded). + // + // This might happen because the event manager wrongly removes the entire event structure while the + // last plugin hasn't unloaded its events (throws on line 268) or there's an off-by-one error (line(s) 295 and / or 309) + // that causes the former to occur. + // + // This issue will not happen if the event is hooked in another plugin and never unhooked. + // The best way to observe it is on a clean install of SourceMod. - HookEvent("player_team", OnPlayerTeam); -} - -public void OnRoundStart(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnSetupFinished(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnRoundEnd(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnPlayerSpawn(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnPlayerDeath(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnPlayerInventory(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnBroadcastAudio(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; -} - -public void OnObjectDeflected(Event hEvent, char[] strEventName, bool bDontBroadcast) -{ - return; + HookEvent("teamplay_round_start", VoidCallback); + HookEvent("arena_round_start", VoidCallback); + HookEvent("teamplay_round_win", VoidCallback); + HookEvent("player_spawn", VoidCallback); + HookEvent("player_death", VoidCallback); + HookEvent("post_inventory_application", VoidCallback); + HookEvent("teamplay_broadcast_audio", VoidCallback); + HookEvent("object_deflected", VoidCallback); + + HookEvent("player_team", VoidCallback); } -public void OnPlayerTeam(Event hEvent, char[] strEventName, bool bDontBroadcast) +public void VoidCallback(Event hEvent, char[] strEventName, bool bDontBroadcast) { return; } diff --git a/Subplugins/NoBlock/plugins/TF2DodgeballNoBlock.smx b/Subplugins/NoBlock/plugins/TF2DodgeballNoBlock.smx index b4e33e189773558775bd22fabd2b64de2f80b39c..baee3e76ad9bc1fb5238e29c0faaad90f8eaf5aa 100644 GIT binary patch delta 2849 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 diff --git a/Subplugins/NoBlock/scripting/TF2DodgeballNoBlock.sp b/Subplugins/NoBlock/scripting/TF2DodgeballNoBlock.sp index d678b4f..4ed3b12 100644 --- a/Subplugins/NoBlock/scripting/TF2DodgeballNoBlock.sp +++ b/Subplugins/NoBlock/scripting/TF2DodgeballNoBlock.sp @@ -65,4 +65,4 @@ public void OnPlayerSpawn(Event hEvent, char[] strEventName, bool bDontBroadcast // SetEntityCollisionGroup makes the server crash after a while. No idea why. SetEntProp(iClient, Prop_Data, "m_CollisionGroup", COLLISION_GROUP_PUSHAWAY); -} \ No newline at end of file +} diff --git a/TF2Dodgeball/addons/sourcemod/configs/dodgeball/general.cfg b/TF2Dodgeball/addons/sourcemod/configs/dodgeball/general.cfg index 168c470..7d7b2ae 100644 --- a/TF2Dodgeball/addons/sourcemod/configs/dodgeball/general.cfg +++ b/TF2Dodgeball/addons/sourcemod/configs/dodgeball/general.cfg @@ -136,7 +136,7 @@ "neutral rocket" "0" // Does the rocket have no team based targets? (Default : 0) "keep direction" "1" // Does the rocket keep its direction after touching a surface? (Default : 0) "teamless deflects" "0" // Can this rocket be deflected by anyone? Same as neutral but targeting is not affected. (Default : 0) - "reset bounces" "0" // Does this rocket reset its internal bounces count on deflect? (Default : 0) + "reset bounces" "1" // Does this rocket reset its internal bounces count on deflect? (Default : 0) "no bounce drags" "0" // Can you drag this rocket after it touched a surface? Does not affect "legacy homing" rockets. (Default : 0) "can be stolen" "0" // Can you steal this rocket from its target? (Default : 0) "steal team check" "1" // Checks if the stealer and the target are on the same team. (Default : 0) @@ -163,7 +163,7 @@ "drag time min" "0.05" // After how many seconds (since deflect) can you drag? Does not affect "legacy homing" rockets. "drag time max" "0.05" // Max time to drag the rocket. Does not affect "legacy homing" rockets. - "max bounces" "10000" // How many times can this rocket bounce? + "max bounces" "1000" // How many times can this rocket bounce? "bounce scale" "1.0" // How hard should the rocket bounce? (Default : 1.0 multiplier) "critical chance" "100" // Percentage of chance for a critical rocket. @@ -264,4 +264,4 @@ "nuke%" "10" // Chance to spawn a nuke rocket } } -} \ No newline at end of file +}