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

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

1 files changed, 20 insertions, 0 deletions

diff --git a/Minecraft.World/AbsoptionMobEffect.cpp b/Minecraft.World/AbsoptionMobEffect.cpp
new file mode 100644
index 00000000..6f5e1647
--- /dev/null
+++ b/Minecraft.World/AbsoptionMobEffect.cpp
@@ -0,0 +1,20 @@
+#include "stdafx.h"
+#include "net.minecraft.world.entity.h"
+#include "net.minecraft.world.effect.h"
+#include "AbsoptionMobEffect.h"
+
+AbsoptionMobEffect::AbsoptionMobEffect(int id, bool isHarmful, eMinecraftColour color) : MobEffect(id, isHarmful, color)
+{
+}
+
+void AbsoptionMobEffect::removeAttributeModifiers(shared_ptr<LivingEntity> entity, BaseAttributeMap *attributes, int amplifier)
+{
+	entity->setAbsorptionAmount(entity->getAbsorptionAmount() - 4 * (amplifier + 1));
+	MobEffect::removeAttributeModifiers(entity, attributes, amplifier);
+}
+
+void AbsoptionMobEffect::addAttributeModifiers(shared_ptr<LivingEntity> entity, BaseAttributeMap *attributes, int amplifier)
+{
+	entity->setAbsorptionAmount(entity->getAbsorptionAmount() + 4 * (amplifier + 1));
+	MobEffect::addAttributeModifiers(entity, attributes, amplifier);
+}