From 0a1d469c6813a04b3b4e7528f53404cb1fd754d5 Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Sat, 3 Jun 2023 14:15:33 -0400 Subject: [PATCH] Fix Offset values being saved to the ZONE_UNIT class itself (#1947) --- Moose Development/Moose/Core/Zone.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index f38fe83c4..12391027c 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -1616,7 +1616,11 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset) if (Offset.dx or Offset.dy) and (Offset.rho or Offset.theta) then error("Cannot use (dx, dy) with (rho, theta)") end + end + local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) ) + + if Offset then self.dy = Offset.dy or 0.0 self.dx = Offset.dx or 0.0 self.rho = Offset.rho or 0.0 @@ -1624,8 +1628,6 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset) self.relative_to_unit = Offset.relative_to_unit or false end - local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) ) - self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } ) self.ZoneUNIT = ZoneUNIT