From 564e11fc2f3731383cecedac8aade4dd9ecdc243 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Fri, 21 Mar 2014 20:12:13 +0000
Subject: [PATCH] Fix merge mistake when rebasing for PR #1169

---
 src/environment.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/environment.cpp b/src/environment.cpp
index 4b8425774..630f8d21a 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -795,8 +795,7 @@ neighbor_found:
 				// Call all the trigger variations
 				i->abm->trigger(m_env, p, n);
 				i->abm->trigger(m_env, p, n,
-						active_object_count,
-						active_object_count_wider + active_object_count);
+						active_object_count, active_object_count_wider);
 
 				// Count surrounding objects again if the abms added any
 				if(m_env->m_added_objects > 0) {