refactor: remove basic type containers

This commit is contained in:
orng
2026-03-25 17:47:40 -05:00
parent f4a2db1252
commit f1ae42c659
36 changed files with 684 additions and 799 deletions

View File

@@ -3,8 +3,8 @@
#include "../../IO/Streams/InputOutputStream.h"
#include "PacketListener.h"
#include "../../WorldGen/Features/BasicTreeFeature.h"
#include "../../Util/BasicTypeContainers.h"
#include "UpdateMobEffectPacket.h"
#include <limits>
UpdateMobEffectPacket::UpdateMobEffectPacket() {
entityId = 0;
@@ -19,8 +19,8 @@ UpdateMobEffectPacket::UpdateMobEffectPacket(int entityId,
effectId = (BYTE)(effect->getId() & 0xff);
effectAmplifier = (char)(effect->getAmplifier() & 0xff);
if (effect->getDuration() > Short::MAX_VALUE) {
effectDurationTicks = Short::MAX_VALUE;
if (effect->getDuration() > std::numeric_limits<short>::max()) {
effectDurationTicks = std::numeric_limits<short>::max();
} else {
effectDurationTicks = (short)effect->getDuration();
}
@@ -41,7 +41,7 @@ void UpdateMobEffectPacket::write(DataOutputStream* dos) {
}
bool UpdateMobEffectPacket::isSuperLongDuration() {
return effectDurationTicks == Short::MAX_VALUE;
return effectDurationTicks == std::numeric_limits<short>::max();
}
void UpdateMobEffectPacket::handle(PacketListener* listener) {
@@ -56,4 +56,4 @@ bool UpdateMobEffectPacket::isInvalidatedBy(std::shared_ptr<Packet> packet) {
std::shared_ptr<UpdateMobEffectPacket> target =
std::dynamic_pointer_cast<UpdateMobEffectPacket>(packet);
return target->entityId == entityId && target->effectId == effectId;
}
}