BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Avoid jittering when player is attached (#12439)

Browse Source 
* Avoid very jittering when player is attached.

Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: Vitaliy <numzer0@yandex.ru>
This commit is contained in:
lhofhansl 2023-05-28 11:36:34 -07:00 committed by GitHub
parent 394dd9ffa5
commit 6832bf044e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/activeobjectmgr.h
View File

@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once #pragma once
#include <unordered_map> #include <map>
#include "irrlichttypes.h" #include "irrlichttypes.h"
class TestClientActiveObjectMgr; class TestClientActiveObjectMgr;
@ -38,8 +38,7 @@ public:
T *getActiveObject(u16 id) T *getActiveObject(u16 id)
{ {
typename std::unordered_map<u16, T *>::const_iterator n = auto n = m_active_objects.find(id);
m_active_objects.find(id);
return (n != m_active_objects.end() ? n->second : nullptr); return (n != m_active_objects.end() ? n->second : nullptr);
} }
@ -62,5 +61,5 @@ protected:
return id != 0 && m_active_objects.find(id) == m_active_objects.end(); return id != 0 && m_active_objects.find(id) == m_active_objects.end();
} }
std::unordered_map<u16, T *> m_active_objects; std::map<u16, T *> m_active_objects; // ordered to fix #10985
}; };