LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-18 20:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove calls to Vec3::newTemp and Vec3::newPermanent

Browse Source
This commit is contained in:
orng
2026-03-26 13:29:05 -05:00
parent bee10e55a8
commit e887c8cf45
63 changed files with 407 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.World/WorldGen/Structures/Village.cpp
View File

@@ -7,6 +7,7 @@
#include "../../Headers/net.minecraft.world.phys.h"
#include "Village.h"
#include <limits>
#include <optional>
Village::Aggressor::Aggressor(std::shared_ptr<LivingEntity> mob,
int timeStamp) {
@@ -60,9 +61,9 @@ void Village::tick(int tick) {
int idealGolemCount = populationSize / 10;
if (golemCount < idealGolemCount && doorInfos.size() > 20 &&
level->random->nextInt(7000) == 0) {
Vec3* spawnPos =
auto spawnPos =
findRandomSpawnPos(center->x, center->y, center->z, 2, 4, 2);
if (spawnPos != NULL) {
if (spawnPos.has_value()) {
std::shared_ptr<VillagerGolem> vg =
std::shared_ptr<VillagerGolem>(new VillagerGolem(level));
vg->setPos(spawnPos->x, spawnPos->y, spawnPos->z);
@@ -88,16 +89,17 @@ void Village::tick(int tick) {
// }
}
Vec3* Village::findRandomSpawnPos(int x, int y, int z, int sx, int sy, int sz) {
std::optional<Vec3> Village::findRandomSpawnPos(int x, int y, int z, int sx,
int sy, int sz) {
for (int i = 0; i < 10; ++i) {
int xx = x + level->random->nextInt(16) - 8;
int yy = y + level->random->nextInt(6) - 3;
int zz = z + level->random->nextInt(16) - 8;
if (!isInside(xx, yy, zz)) continue;
if (canSpawnAt(xx, yy, zz, sx, sy, sz))
return Vec3::newTemp(xx, yy, zz);
if (canSpawnAt(xx, yy, zz, sx, sy, sz)) return Vec3(xx, yy, zz);
}
return NULL;
return std::nullopt;
}
bool Village::canSpawnAt(int x, int y, int z, int sx, int sy, int sz) {