From b7e1721f8d1fce04e5dc735f25e15d7fac2105ed Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Fri, 8 Mar 2019 18:26:39 -0500 Subject: [PATCH] Parent last --- Classic/scripts/DMGame.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classic/scripts/DMGame.cs b/Classic/scripts/DMGame.cs index bcc8b35..19dcf53 100644 --- a/Classic/scripts/DMGame.cs +++ b/Classic/scripts/DMGame.cs @@ -526,8 +526,6 @@ function Player::maxInventory(%this, %data) function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC) { - parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); - //Other armors get more damage if(%targetObject.client.armor $= "Medium") { @@ -538,6 +536,8 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am { %amount *= 1.5; } + + parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); } };