luanti-org · Jul 8, 2018
diff --git a/‎build/android/jni/Android.mk
-1 b/‎build/android/jni/Android.mk
-1
diff --git a/‎src/content_sao.cpp
-6 b/‎src/content_sao.cpp
-6
diff --git a/‎src/irr_aabb3d.h
-2 b/‎src/irr_aabb3d.h
-2
diff --git a/‎src/irr_v3d.h
+2-18 b/‎src/irr_v3d.h
+2-18
diff --git a/‎src/server/CMakeLists.txt
-1 b/‎src/server/CMakeLists.txt
-1
diff --git a/‎src/server/serveractiveobjectmap.cpp
-215 b/‎src/server/serveractiveobjectmap.cpp
-215
@@ -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                    \
 
@@ -287,7 +287,6 @@ ObjectProperties* UnitSAO::accessObjectProperties()
 
 void UnitSAO::notifyObjectPropertiesModified()
 {
-	m_env->updateActiveObject(this);
 	m_properties_sent = false;
 }
 
@@ -334,8 +333,6 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
 		// Get properties
 		m_env->getScriptIface()->
 			luaentity_GetProperties(m_id, &m_prop);
-		// Notify the environment of the new properties
-		m_env->updateActiveObject(this);
 		// Initialize HP from properties
 		m_hp = m_prop.hp_max;
 		// Activate entity, supplying serialized state
@@ -669,7 +666,6 @@ void LuaEntitySAO::setPos(const v3f &pos)
 	if(isAttached())
 		return;
 	m_base_position = pos;
-	m_env->updateActiveObject(this);
 	sendPosition(false, true);
 }
 
@@ -678,7 +674,6 @@ void LuaEntitySAO::moveTo(v3f pos, bool continuous)
 	if(isAttached())
 		return;
 	m_base_position = pos;
-	m_env->updateActiveObject(this);
 	if(!continuous)
 		sendPosition(true, true);
 }
@@ -1169,7 +1164,6 @@ void PlayerSAO::setBasePosition(const v3f &position)
 
 	// Updating is not wanted/required for player migration
 	if (m_env) {
-		m_env->updateActiveObject(this);
 		m_position_not_sent = true;
 	}
 }
 
@@ -24,5 +24,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <aabbox3d.h>
 
 typedef core::aabbox3d<f32> aabb3f;
-typedef core::aabbox3d<s16> aabb3s16;
-typedef core::aabbox3d<s32> aabb3s32;
@@ -18,29 +18,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #pragma once
+
 #include "irrlichttypes.h"
+
 #include <vector3d.h>
-#include <functional>
 
 typedef core::vector3df v3f;
 typedef core::vector3d<double> v3d;
 typedef core::vector3d<s16> v3s16;
 typedef core::vector3d<u16> v3u16;
 typedef core::vector3d<s32> v3s32;
-
-namespace std
-{
-template <> struct hash<v3s16>
-{
-	typedef v3s16 argument_type;
-	typedef std::size_t result_type;
-	result_type operator()(const argument_type &s) const noexcept
-	{
-		// clang-format off
-		return static_cast<size_t>((static_cast<u64>(s.X) << 20) ^
-		                           (static_cast<u64>(s.Y) << 10) ^
-		                           (static_cast<u64>(s.Z)));
-		// clang-format on
-	}
-};
-}
@@ -1,4 +1,3 @@
 set(server_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobjectmap.cpp
 	PARENT_SCOPE)
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,6 @@ ObjectProperties* UnitSAO::accessObjectProperties()`
`287`	`287`
`288`	`288`	`void UnitSAO::notifyObjectPropertiesModified()`
`289`	`289`	`{`
`290`		`- m_env->updateActiveObject(this);`
`291`	`290`	`m_properties_sent = false;`
`292`	`291`	`}`
`293`	`292`
`@@ -334,8 +333,6 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)`
`334`	`333`	`// Get properties`
`335`	`334`	`m_env->getScriptIface()->`
`336`	`335`	`luaentity_GetProperties(m_id, &m_prop);`
`337`		`- // Notify the environment of the new properties`
`338`		`- m_env->updateActiveObject(this);`
`339`	`336`	`// Initialize HP from properties`
`340`	`337`	`m_hp = m_prop.hp_max;`
`341`	`338`	`// Activate entity, supplying serialized state`
`@@ -669,7 +666,6 @@ void LuaEntitySAO::setPos(const v3f &pos)`
`669`	`666`	`if(isAttached())`
`670`	`667`	`return;`
`671`	`668`	`m_base_position = pos;`
`672`		`- m_env->updateActiveObject(this);`
`673`	`669`	`sendPosition(false, true);`
`674`	`670`	`}`
`675`	`671`
`@@ -678,7 +674,6 @@ void LuaEntitySAO::moveTo(v3f pos, bool continuous)`
`678`	`674`	`if(isAttached())`
`679`	`675`	`return;`
`680`	`676`	`m_base_position = pos;`
`681`		`- m_env->updateActiveObject(this);`
`682`	`677`	`if(!continuous)`
`683`	`678`	`sendPosition(true, true);`
`684`	`679`	`}`
`@@ -1169,7 +1164,6 @@ void PlayerSAO::setBasePosition(const v3f &position)`
`1169`	`1164`
`1170`	`1165`	`// Updating is not wanted/required for player migration`
`1171`	`1166`	`if (m_env) {`
`1172`		`- m_env->updateActiveObject(this);`
`1173`	`1167`	`m_position_not_sent = true;`
`1174`	`1168`	`}`
`1175`	`1169`	`}`