LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-23 11:06:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove AABB::newTemp when not returned

Browse Source
This commit is contained in:
orng
2026-03-27 21:56:57 -05:00
parent 534879e2e7
commit d7d99db4c5
24 changed files with 112 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.World/Items/ArmorItem.cpp
+3 -3
View File
@@ -26,10 +26,10 @@ std::shared_ptr<ItemInstance> ArmorItem::ArmorDispenseItemBehavior::execute(
int x = source->getBlockX() + facing->getStepX();
int y = source->getBlockY() + facing->getStepY();
int z = source->getBlockZ() + facing->getStepZ();
AABB* bb = AABB::newTemp(x, y, z, x + 1, y + 1, z + 1);
AABB bb = AABB(x, y, z, x + 1, y + 1, z + 1);
EntitySelector* selector = new MobCanWearArmourEntitySelector(dispensed);
std::vector<std::shared_ptr<Entity> >* entities =
source->getWorld()->getEntitiesOfClass(typeid(LivingEntity), bb,
source->getWorld()->getEntitiesOfClass(typeid(LivingEntity), &bb,
selector);
delete selector;
@@ -237,4 +237,4 @@ Icon* ArmorItem::getEmptyIcon(int slot) {
}
return NULL;
}
}
Minecraft.World/Items/LeashItem.cpp
+8 -7
View File
@@ -3,6 +3,7 @@
#include "../Headers/net.minecraft.world.level.h"
#include "../Headers/net.minecraft.world.entity.h"
#include "../Headers/net.minecraft.world.phys.h"
#include "Util/AABB.h"
#include "LeashItem.h"
LeashItem::LeashItem(int id) : Item(id) {}
@@ -35,9 +36,9 @@ bool LeashItem::bindPlayerMobs(std::shared_ptr<Player> player, Level* level,
// look for entities that can be attached to the fence
bool foundMobs = false;
double range = 7;
std::vector<std::shared_ptr<Entity> >* mobs = level->getEntitiesOfClass(
typeid(Mob), AABB::newTemp(x - range, y - range, z - range, x + range,
y + range, z + range));
AABB mob_bb = AABB(x, y, z, x, y, z).grow(range, range, range);
std::vector<std::shared_ptr<Entity> >* mobs =
level->getEntitiesOfClass(typeid(Mob), &mob_bb);
if (mobs != NULL) {
for (AUTO_VAR(it, mobs->begin()); it != mobs->end(); ++it) {
std::shared_ptr<Mob> mob = std::dynamic_pointer_cast<Mob>(*it);
@@ -59,9 +60,9 @@ bool LeashItem::bindPlayerMobsTest(std::shared_ptr<Player> player, Level* level,
int x, int y, int z) {
// look for entities that can be attached to the fence
double range = 7;
std::vector<std::shared_ptr<Entity> >* mobs = level->getEntitiesOfClass(
typeid(Mob), AABB::newTemp(x - range, y - range, z - range, x + range,
y + range, z + range));
AABB mob_bb = AABB(x, y, z, x, y, z).grow(range, range, range);
std::vector<std::shared_ptr<Entity> >* mobs =
level->getEntitiesOfClass(typeid(Mob), &mob_bb);
if (mobs != NULL) {
for (AUTO_VAR(it, mobs->begin()); it != mobs->end(); ++it) {
@@ -71,4 +72,4 @@ bool LeashItem::bindPlayerMobsTest(std::shared_ptr<Player> player, Level* level,
}
}
return false;
}
}