Merge pull request #10 from meta53/event-flush-removal

Remove unnecessary flush commands from various event handlers to streamline event processing and improve performance. This includes removing flush commands from functions related to target engagement, healing, looting, and off-tanking events, among others. The changes aim to reduce potential delays caused by flushing events that are no longer needed, enhancing the overall efficiency of the script.

Author: meta53

bot_brd.mac

@@ -55,7 +55,6 @@ Sub Events_BRD
 
 Sub EVENT_Sing(_line, _sender, _eventParams)	
 	/call SingSongs ${str_currentMedley}
-	/doevents flush Sing
 /return
 
 Sub SingSongs(string _type)
@@ -67,13 +66,11 @@ Sub SingSongs(string _type)
 
 Sub EVENT_Hush(_line, _sender, _eventParams)
 	/medley stop
-	/doevents flush Hush
 /return
 
 Sub Event_BardSlow
 	/echo \awToggling Bard Slow \ag${bln_bardSlow} \awto TRUE
 	/call ToggleBardSlow TRUE
-	/doevents flush BardSlow
 /return
 
 

bot_clr.mac

@@ -207,13 +207,11 @@ Sub EVENT_DivineInterventionRequest(_line, _sender, _eventParams)
 			/docommand /${announceChannel} DI is NOT ready, ask someone else!
 		}
 	}
-	/doevents flush DivineInterventionRequest
 /return
 
 
 Sub Event_AutoRezOn
 	/call AutoRezON
-	/doevents flush AutoRezON
 /return
 
 Sub AutoRezON
@@ -223,7 +221,6 @@ Sub AutoRezON
 
 Sub Event_AutoRezOff
 	/call AutoRezOFF
-	/doevents flush AutoRezOFF
 /return 
 
 Sub AutoRezOFF
@@ -234,7 +231,6 @@ Sub AutoRezOFF
 
 Sub Event_CombatRezON
 	/call CombatRezON
-	/doevents flush CombatRezON
 /return
 
 Sub CombatRezON 
@@ -245,7 +241,6 @@ Sub CombatRezON
 
 Sub Event_CombatRezOFF
 	/call CombatRezOFF
-	/doevents flush CombatRezOFF
 /return 
 
 Sub CombatRezOFF

bot_melee.mac

@@ -162,15 +162,13 @@ Sub chkUtils
 /return
 
 Sub EVENT_WARCRYON_1
-	/doevents flush WARCRYON_1
 	/if (${BURN_Group}==1) {
 		/echo \agEnabling \arWarCry \agMode on CoHort \ao1
 		/call FireWarCry
 	}
 /return 
 
 Sub EVENT_WARCRYON_2
-	/doevents flush WARCRYON_2
 	/if (${BURN_Group}==2) {
 		/echo \agEnabling \arWarCry \agMode on CoHort \ao2
 		/call FireWarCry

bot_pal.mac

@@ -158,20 +158,17 @@ Sub EVENT_STUNMOB(_line, _chatSender, _eventParams)
 	/echo \ayI should stun this mob
 	/call TrueTarget(${_eventParams.Arg[1, ]})
 	/call chkStun TRUE
-	/doevents flush STUNMOB
 /return
 
 Sub EVENT_STUNLOCK(_line, _chatSender, _eventParams)
 	/echo \aoI am Stun Locking this mob
 	/call TrueTarget(${_eventParams.Arg[1, ]})
 	/call chkStunLock
-	/doevents flush STUNLOCK
 /return
 
 Sub EVENT_STUNSTOP(_line, _chatSender, _eventParams)
 	/echo \agI am no lnger Stun Locking the mob
 	/call chkStunLockStop
-	/doevents flush STUNLOCKSTOP
 /return
 
 

bot_pull.mac

@@ -674,14 +674,12 @@ Sub killTarget
 
 
 Sub Event_TooClose
-	/doevents flush TooClose
 	/echo Event_TooClose
 	/varset bln_tooClose TRUE
 
 /return
 
 Sub Event_NoLOS
-	/doevents flush NoLOS
 	/echo Event_NoLOS
 	/nav target
 	/delay 10

bot_wiz.mac

@@ -196,7 +196,6 @@ Sub variant_initialize(string _strTankName, int _intAssistAt, int _intTankHealPo
 Sub EVENT_MANABURN
 	/echo MBURN CALLED
 	/call MQ2Cast "Mana Burn" alt
-	/doevents flush
 /return
 
 Sub EVENT_AEON
@@ -211,7 +210,6 @@ SUB EVENT_AEOFF
 
 SUB EVENT_FIRETL
 	/if (!${bln_tlUse}) /return
-	/doevents flush
 	/dgt Firing TL
 	/call MQ2Cast "${str_tlSpell}" ${str_tlGem}
 	/delay 1m

xiris_common/xiris_buffing.inc

@@ -91,8 +91,6 @@ Sub EVENT_DORAIDBUFFS(_line, _chatSender, _eventParams)
 	/delay 10
 	| Restore the previous spellset
 	/memspellset ${str_spellset}
-
-	/doevents flush DORAIDBUFFS
 /return
 
 Sub EVENT_DOCHARBUFFS(_line, _chatSender, _eventParams)
@@ -106,8 +104,6 @@ Sub EVENT_DOCHARBUFFS(_line, _chatSender, _eventParams)
 	/delay 10
 	| Restore the previous spellset
 	/memspellset ${str_spellset}
-	
-	/doevents flush DOCHARBUFFS
 /return
 
 
@@ -121,8 +117,6 @@ Sub EVENT_DOSINGLETARGETBUFFS(_line, _chatSender, _eventParams)
 		/call doSingleTargetBuffOnChar ${_eventParams}
 	}
 	/memspellset ${str_spellset}
-	
-	/doevents flush DOSINGLETARGETBUFFS
 /return
 
 Sub EVENT_DOSPECIFICBUFFONCHAR(string _text, string _sender, string _buffer, string _spell);
@@ -138,7 +132,6 @@ Sub EVENT_DOSPECIFICBUFFONCHAR(string _text, string _sender, string _buffer, str
 	/memspellset buff
 	/call doSpecificBuffOnChar ${_sender} "${_spell}"
 	/memspellset ${str_spellset}
-	/doevents flush DOSPECIFICBUFFONCHAR
 /return
 
 
@@ -624,12 +617,10 @@ Sub EVENT_REMOVEBUFF(_line, _chatSender, _eventParams)
 	/declare buffToRemove string local ${_eventParams.Arg[1,-]}
 	/echo \awEvent Remove Buff called: ${_eventParams} -> ${buffToRemove}
 	/call RemoveBuff "${buffToRemove}"
-	/doevents flush REMOVEBUFF
 /return
 
 Sub EVENT_REMOVEALLBUFFS(_line, _chatSender, _eventParams)
 	/call RemoveAllBuffs
-	/doevents flush REMOVEALLBUFFS
 /return
 
 Sub RemoveAllBuffs
@@ -671,7 +662,6 @@ Sub RemoveDS
 		/medley ${str_currentMedley}
 	}	
 	:return
-	/doevents flush NoDS
 /return 
 
 
@@ -684,7 +674,6 @@ Sub EVENT_YesDS(_line, _sender, _eventParams)s
 		/medley ${str_savedMedley}
 	}
 	:return
-	/doevents flush YesDS
 /return
 
 

xiris_common/xiris_burn.inc

@@ -53,7 +53,6 @@ Sub EVENT_BurnOn
 	/echo \agEnabling \arBurn \agMode
 	/varset bln_burning TRUE
 	/varset bln_checkForCry FALSE
-	/doevents flush BurnOn
 /return
 
 Sub EVENT_BurnOnAll
@@ -62,7 +61,6 @@ Sub EVENT_BurnOnAll
 	/echo \agEnabling \arBurn ALL \agMode
 	/varset bln_burning TRUE
 	/varset bln_checkForCry FALSE
-	/doevents flush BurnOnAll
 /return
 
 Sub EVENT_BurnOn1
@@ -72,7 +70,6 @@ Sub EVENT_BurnOn1
 		/varset bln_burning TRUE
 	}
 	/varset bln_checkForCry TRUE
-	/doevents flush BurnOn1
 /return
 
 Sub EVENT_BurnOn2
@@ -82,14 +79,12 @@ Sub EVENT_BurnOn2
 		/varset bln_burning TRUE
 	}
 	/varset bln_checkForCry FALSE
-	/doevents flush BurnOn2
 /return
 
 Sub EVENT_BurnOff
 	/echo \agDisablig \ayBurn \agMode
 	/varset bln_burning FALSE
 	/varset bln_checkForCry FALSE
-	/doevents flush BurnOff
 	|/call chkCryActive
 /return
 

xiris_common/xiris_casting.inc

@@ -632,7 +632,6 @@ Sub chkSpellMemorized(string _spell, bool _wait, string _gem)
 
 Sub Event_ChkHasSpell(_line, _sender, _eventParams)
 	/echo line: ${_line} sender: ${_sender} params:${_eventParams}
-	/doevents flush ChkHasSpell 
 	/declare clz   string local ${_eventParams.Arg[1,|]}
 	/declare sName string local ${_eventParams.Arg[2,|]}
 	/call chkHasSpell ${clz} "${sName}"
@@ -702,20 +701,17 @@ Sub ResetCastTimers
 |-- MEZ IMMUNE
 Sub Event_MezImmune
 	/${cmdChannel} mezimmunemob ${Target.CleanName}
-	/doevents flush MezImmune
 /return
 
 |-- SNARE IMMUNE-|
 Sub Event_SnareImmune
 	/varset bln_snareActive	TRUE
 	/${cmdChannel} snareimmunemob ${Target.CleanName}
-	/doevents flush SnareImmune
 /return
 
 Sub Event_Snareon
 	/varset bln_snareActive	TRUE
 	/if (${bln_snareUse}) /${cmdChannel} snared: ${Target.CleanName}
-	/doevents flush Snareon
 /return
 
 Sub Event_SnareResist
@@ -729,12 +725,10 @@ Sub Event_SnareResist
 		/varcalc int_snareCounter ${int_snareCounter}+1
 		/if (${bln_snareUse}) /${cmdChannel} snare resisted LTE 3: Trying Again
 	}
-	/doevents flush SnareResist
 /return
 
 Sub Event_SnareWornOff
 	/varset bln_snareActive FALSE
-	/doevents flush SnareWornOff
 /return
 
 Sub EVENT_SetUseFastOnly(_line, _chatSender, _eventParams)
@@ -745,7 +739,6 @@ Sub EVENT_SetUseFastOnly(_line, _chatSender, _eventParams)
 		/echo \aoSetting fast only:\ag${_eventParams}
 		/varset bln_useFastOnly FALSE
 	}
-	/doevents flush SetUseFastOnly
 /return 
 
 
@@ -762,7 +755,6 @@ Sub EVENT_SetResistType(_line, _chatSender, _eventParams)
 
 	/if (${_strResists.Equal[ALL]}) /varset _strResists ${str_defaultResistTypes}
 	/call SetResistTypes ${_strResists}
-	/doevents flush SetResistType
 /return 
 
 Sub SetResistTypes(string _typesCSV)