pet duels fix

yrpen · Mar 25, 2017 · b11ef64 · b11ef64
1 parent 137a304
commit b11ef64
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/pets_system/creature_on_target_combat.lua b/pets_system/creature_on_target_combat.lua
@@ -1,6 +1,6 @@
 function Creature:onTargetCombat(target)
     if PETS and PETS.SYSTEM.DUELS_ONLY then
-        if self:isPet() and target:isPlayer() or target:isPet() and self:isPlayer() then
+        if self:isPet() and target:isPlayer() then
             return false
         end
     end

diff --git a/pets_system/pet_creaturescript.lua b/pets_system/pet_creaturescript.lua
@@ -1,5 +1,7 @@
 -- <event type="preparedeath" name="PetDeath" script="pet_creaturescript.lua" />
 -- <event type="kill" name="PetKill" script="pet_creaturescript.lua" />
+-- <event type="think" name="PetTeleport" script="pet_creaturescript.lua" />
+-- <event type="healthchange" name="PetHealthChange" script="pet_creaturescript.lua" />
 
 function onPrepareDeath(creature, killer)
     local player = creature:getMaster()
@@ -40,3 +42,11 @@ function onThink(creature, interval)
     end
     return true
 end
+
+function onHealthChange(creature, attacker, primaryDamage, primaryType, secondaryDamage, secondaryType, origin)
+    if attacker and attacker:isPlayer() then
+        return 0, primaryType, 0, secondaryType
+    end
+
+    return primaryDamage, primaryType, secondaryDamage, secondaryType
+end
diff --git a/pets_system/pets_lib.lua b/pets_system/pets_lib.lua
@@ -363,6 +363,10 @@ function Player.summonPet(self, position)
             pet:registerEvent("PetTeleport")
         end
 
+        if PETS.SYSTEM.DUELS_ONLY then
+            pet:registerEvent("PetHealthChange")
+        end
+
         if PETS.SYSTEM.MOUNTS then
             local mountId = self:getPetMountId()
             if mountId ~= nil then