aboutsummaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorBob Blackmon <bob.blackmon@ymail.com>2017-04-03 10:49:27 -0400
committerBob Blackmon <bob.blackmon@ymail.com>2017-04-03 10:49:27 -0400
commitd36ecf8d732e49132e4aca59a797efc8add45f53 (patch)
treeba4824ae3f6a42347b6ea1773cc9677f77edc3dd /lua
parent94cbb9b7b71b40caf0bc54c8aad0cbdf08b8b850 (diff)
downloadzones-d36ecf8d732e49132e4aca59a797efc8add45f53.tar.gz
zones-d36ecf8d732e49132e4aca59a797efc8add45f53.tar.bz2
zones-d36ecf8d732e49132e4aca59a797efc8add45f53.zip
Changed hook to merge
Diffstat (limited to 'lua')
-rw-r--r--lua/zones.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/lua/zones.lua b/lua/zones.lua
index 876131e..23b2aca 100644
--- a/lua/zones.lua
+++ b/lua/zones.lua
@@ -282,7 +282,7 @@ if SERVER then
zones.Remove(from)
- hook.Run("OnZoneChanged",zto,zto.class,to)
+ hook.Run("OnZoneMerged",zto,zto.class,to,zfrom,zfrom.class,from)
zones.Sync()