Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 22 insertions, 7 deletions

diff --git a/Minecraft.World/UpdateMobEffectPacket.cpp b/Minecraft.World/UpdateMobEffectPacket.cpp
index dec8d79f..e2f6233e 100644
--- a/Minecraft.World/UpdateMobEffectPacket.cpp
+++ b/Minecraft.World/UpdateMobEffectPacket.cpp
@@ -2,24 +2,34 @@
 #include "net.minecraft.world.effect.h"
 #include "InputOutputStream.h"
 #include "PacketListener.h"
+#include "BasicTree.h"
+#include "BasicTypeContainers.h"
 #include "UpdateMobEffectPacket.h"
 
 
 
 UpdateMobEffectPacket::UpdateMobEffectPacket()
 {
-	this->entityId = 0;
-	this->effectId = 0;
-	this->effectAmplifier = 0;
-	this->effectDurationTicks = 0;
+	entityId = 0;
+	effectId = 0;
+	effectAmplifier = 0;
+	effectDurationTicks = 0;
 }
 
 UpdateMobEffectPacket::UpdateMobEffectPacket(int entityId, MobEffectInstance *effect)
 {
 	this->entityId = entityId;
-	this->effectId = (BYTE) (effect->getId() & 0xff);
-	this->effectAmplifier = (char) (effect->getAmplifier() & 0xff);
-	this->effectDurationTicks = (short) effect->getDuration();
+	effectId = (BYTE) (effect->getId() & 0xff);
+	effectAmplifier = (char) (effect->getAmplifier() & 0xff);
+
+	if (effect->getDuration() > Short::MAX_VALUE)
+	{
+		effectDurationTicks = Short::MAX_VALUE;
+	}
+	else
+	{
+		effectDurationTicks = (short) effect->getDuration();
+	}
 }
 
 void UpdateMobEffectPacket::read(DataInputStream *dis)
@@ -38,6 +48,11 @@ void UpdateMobEffectPacket::write(DataOutputStream *dos)
 	dos->writeShort(effectDurationTicks);
 }
 
+bool UpdateMobEffectPacket::isSuperLongDuration()
+{
+	return effectDurationTicks == Short::MAX_VALUE;
+}
+
 void UpdateMobEffectPacket::handle(PacketListener *listener)
 {
 	listener->handleUpdateMobEffect(shared_from_this());