Skip to content

Commit 2e4d108

Browse files
committed
refactor: remove unnecessary dAccess
1 parent ba5468f commit 2e4d108

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/legacy/api/EntityAPI.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@
3030
#include "mc/world/effect/EffectDuration.h"
3131
#include "mc/world/effect/MobEffectInstance.h"
3232
#include "mc/world/level/BlockSource.h"
33-
#include "mc/world/level/IConstBlockSource.h"
34-
#include "mc/world/level/Level.h"
3533
#include "mc/world/level/Spawner.h"
3634
#include "mc/world/level/block/Block.h"
3735
#include "mc/world/level/material/Material.h"
3836
#include "mc/world/phys/AABB.h"
39-
#include "mc/world/phys/HitDetection.h"
4037
#include "mc/world/phys/HitResult.h"
38+
#include "mc/world/level/biome/Biome.h"
4139

4240
#include <climits>
43-
#include <entt/entt.hpp>
44-
#include <magic_enum.hpp>
4541
#include <memory>
4642

4743
using magic_enum::enum_integer;
@@ -1447,7 +1443,7 @@ Local<Value> EntityClass::getBiomeId() {
14471443
Actor* actor = get();
14481444
if (!actor) return Local<Value>();
14491445
auto& bio = actor->getDimensionBlockSource().getBiome(actor->getFeetBlockPos());
1450-
return Number::newNumber(ll::memory::dAccess<int>(&bio, 0x80));
1446+
return Number::newNumber(bio.mId);
14511447
}
14521448
CATCH("Fail in getBiomeId!");
14531449
}
@@ -1457,7 +1453,7 @@ Local<Value> EntityClass::getBiomeName() {
14571453
Actor* actor = get();
14581454
if (!actor) return Local<Value>();
14591455
auto& bio = actor->getDimensionBlockSource().getBiome(actor->getFeetBlockPos());
1460-
return String::newString(ll::memory::dAccess<HashedString>(&bio, 0x08).getString());
1456+
return String::newString(bio.mHash->getString());
14611457
}
14621458
CATCH("Fail in getBiomeName!");
14631459
}

src/legacy/api/PlayerAPI.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696

9797
#include <algorithm>
9898
#include <climits>
99-
#include <list>
10099
#include <memory>
101100
#include <optional>
102101
#include <string>
@@ -3553,7 +3552,7 @@ Local<Value> PlayerClass::getBiomeId() {
35533552
Player* player = get();
35543553
if (!player) return Local<Value>();
35553554
Biome const& bio = player->getDimensionBlockSource().getBiome(player->getFeetBlockPos());
3556-
return Number::newNumber(ll::memory::dAccess<int>(&bio, 0x80));
3555+
return Number::newNumber(bio.mId);
35573556
}
35583557
CATCH("Fail in getBiomeId!");
35593558
}
@@ -3563,7 +3562,7 @@ Local<Value> PlayerClass::getBiomeName() {
35633562
Player* player = get();
35643563
if (!player) return Local<Value>();
35653564
Biome const& bio = player->getDimensionBlockSource().getBiome(player->getFeetBlockPos());
3566-
return String::newString(ll::memory::dAccess<HashedString>(&bio, 0x08).getString());
3565+
return String::newString(bio.mHash->getString());
35673566
}
35683567
CATCH("Fail in getBiomeName!");
35693568
}

0 commit comments

Comments
 (0)