Merge branch 'development' into main

1ForeverHD · May 7, 2021 · 08ffa35 · 08ffa35
2 parents 8ce19ea + dc56537
commit 08ffa35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,10 @@
+## [2.1.3] - May 7 2021
+### Fixed
+- A bug that occured when disconnecting localPlayer events
+
+
+
+--------
 ## [2.1.2] - April 15 2021
 ### Fixed
 - ``playerExiting`` not firing when the player dies and respawns immidately within the zone.

diff --git a/src/Zone/VERSION.lua b/src/Zone/VERSION.lua
@@ -1 +1 @@
--- v2.1.2
+-- v2.1.3
diff --git a/src/Zone/ZoneController.lua b/src/Zone/ZoneController.lua
@@ -277,6 +277,8 @@ function ZoneController._deregisterConnection(registeredZone, registeredTriggerT
 			heartbeatConnections[registeredTriggerType] = nil
 			heartbeatConnection:Disconnect()
 		end
+	else
+		activeTriggers[registeredTriggerType] -= 1
 	end
 	registeredZone.activeTriggers[registeredTriggerType] = nil
 	if dictLength(registeredZone.activeTriggers) == 0 then