Remove legacy content_abm.{cpp,h}

nerzhul · nerzhul · commit ddcd0263442d · 2017-06-14T16:23:08.000+02:00
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
@@ -124,7 +124,6 @@ LOCAL_SRC_FILES := \
 		jni/src/clientobject.cpp                  \
 		jni/src/clouds.cpp                        \
 		jni/src/collision.cpp                     \
-		jni/src/content_abm.cpp                   \
 		jni/src/content_cao.cpp                   \
 		jni/src/content_cso.cpp                   \
 		jni/src/content_mapblock.cpp              \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -370,7 +370,6 @@ set(common_SRCS
 	chat.cpp
 	clientiface.cpp
 	collision.cpp
-	content_abm.cpp
 	content_mapnode.cpp
 	content_nodemeta.cpp
 	content_sao.cpp
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
diff --git a/src/content_abm.h b/src/content_abm.h
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "log.h"
 
-#include "content_abm.h"
 #include "content_sao.h"
 #include "emerge.h"
 #include "mapblock.h"
diff --git a/src/server.cpp b/src/server.cpp
@@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mg_biome.h"
 #include "content_mapnode.h"
 #include "content_nodemeta.h"
-#include "content_abm.h"
 #include "content_sao.h"
 #include "mods.h"
 #include "event_manager.h"
@@ -318,9 +317,6 @@ Server::Server(
 		m_env->loadDefaultMeta();
 	}
 
-	// Add some test ActiveBlockModifiers to environment
-	add_legacy_abms(m_env, m_nodedef);
-
 	m_liquid_transform_every = g_settings->getFloat("liquid_update");
 	m_max_chatmessage_length = g_settings->getU16("chat_message_max_size");
 }
