Merge pull request #210 from smasherprog/TriggerTree

ewjax · web-flow · commit ccffd772c087 · 2025-02-20T18:54:58.000-07:00
removed lifetap event as unique petname identifier
diff --git a/EQTool/Services/Handlers/PetHandler.cs b/EQTool/Services/Handlers/PetHandler.cs
@@ -107,12 +107,11 @@ private void LogEvents_PetEvent(object sender, PetEvent e)
                 }
             }
 
-            // pet leader, pet attacking, pet lifetap
+            // pet leader, pet attacking
             // note we don't check against other pet commands (follow, guard, sit, etc) because those reports are visible from 
             // all nearby pets, and so it is hard to tell which is our pet vs someone else's pet
             else if (e.Incident == PetEvent.PetIncident.LEADER
-                || e.Incident == PetEvent.PetIncident.PETATTACK
-                || e.Incident == PetEvent.PetIncident.PETLIFETAP)
+                || e.Incident == PetEvent.PetIncident.PETATTACK)
             {
                 playerPet.PetName = e.PetName;
             }

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,11 @@ private void LogEvents_PetEvent(object sender, PetEvent e)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`- // pet leader, pet attacking, pet lifetap`
	`110`	`+ // pet leader, pet attacking`
`111`	`111`	`// note we don't check against other pet commands (follow, guard, sit, etc) because those reports are visible from`
`112`	`112`	`// all nearby pets, and so it is hard to tell which is our pet vs someone else's pet`
`113`	`113`	`else if (e.Incident == PetEvent.PetIncident.LEADER`
`114`		`- \|\| e.Incident == PetEvent.PetIncident.PETATTACK`
`115`		`- \|\| e.Incident == PetEvent.PetIncident.PETLIFETAP)`
	`114`	`+ \|\| e.Incident == PetEvent.PetIncident.PETATTACK)`
`116`	`115`	`{`
`117`	`116`	`playerPet.PetName = e.PetName;`
`118`	`117`	`}`