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

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                    \

src/content_sao.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;
	}
}

src/irr_aabb3d.h

@@ -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;

src/irr_v3d.h

@@ -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
	}
};
}

src/server/CMakeLists.txt

@@ -1,4 +1,3 @@
set(server_SRCS
	${CMAKE_CURRENT_SOURCE_DIR}/mods.cpp
	${CMAKE_CURRENT_SOURCE_DIR}/serveractiveobjectmap.cpp
	PARENT_SCOPE)