Revert 6587 - Optimize entity-entity collision (#7539)

2018-07-08 13:30:55 -07:00
parent 334d8c31ee
commit 94cd2bfeac
13 changed files with 80 additions and 634 deletions
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -224,7 +224,6 @@ LOCAL_SRC_FILES := \
 		jni/src/rollback_interface.cpp            \
 		jni/src/serialization.cpp                 \
 		jni/src/server/mods.cpp                   \
-		jni/src/server/serveractiveobjectmap.cpp  \
 		jni/src/server.cpp                        \
 		jni/src/serverenvironment.cpp             \
 		jni/src/serverlist.cpp                    \