LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-25 13:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::deque

Browse Source
This commit is contained in:
Tropical
2026-03-06 20:41:22 -06:00
parent 653a2c4289
commit 967ffbb2a6
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.World/Blocks/NotGateTile.cpp
View File

@@ -4,7 +4,7 @@
#include "../Util/SoundTypes.h"
#include "../Headers/net.minecraft.world.h"
std::unordered_map<Level *, deque<NotGateTile::Toggle> *> NotGateTile::recentToggles = std::unordered_map<Level *, deque<NotGateTile::Toggle> *>();
std::unordered_map<Level *, std::deque<NotGateTile::Toggle> *> NotGateTile::recentToggles = std::unordered_map<Level *, std::deque<NotGateTile::Toggle> *>();
// 4J - added, to tie in with other changes brought forward from 1.3.2 to associate toggles with a level. In addition to what the java
// version does, we are also removing any references to levels that we are storing when they hit their dtor.
@@ -22,7 +22,7 @@ bool NotGateTile::isToggledTooFrequently(Level *level, int x, int y, int z, bool
// 4J - brought forward changes to associate toggles with a level from 1.3.2
if( recentToggles.find(level) == recentToggles.end() )
{
recentToggles[level] = new deque<Toggle>;
recentToggles[level] = new std::deque<Toggle>;
}
if (add) recentToggles[level]->push_back(Toggle(x, y, z, level->getTime()));
int count = 0;
@@ -114,7 +114,7 @@ void NotGateTile::tick(Level *level, int x, int y, int z, Random *random)
// 4J - brought forward changes from 1.3.2 to associate toggles with level
if( recentToggles.find(level) != recentToggles.end() )
{
deque<Toggle> *toggles = recentToggles[level];
std::deque<Toggle> *toggles = recentToggles[level];
while (!toggles->empty() && level->getTime() - toggles->front().when > RECENT_TOGGLE_TIMER)
{
toggles->pop_front();
@@ -223,7 +223,7 @@ int NotGateTile::cloneTileId(Level *level, int x, int y, int z)
void NotGateTile::levelTimeChanged(Level *level, __int64 delta, __int64 newTime)
{
deque<Toggle> *toggles = recentToggles[level];
std::deque<Toggle> *toggles = recentToggles[level];
if (toggles != NULL)
{