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

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

1 files changed, 16 insertions, 2 deletions

diff --git a/Minecraft.World/MobEffectInstance.h b/Minecraft.World/MobEffectInstance.h
index d1c716e6..5d9e68f6 100644
--- a/Minecraft.World/MobEffectInstance.h
+++ b/Minecraft.World/MobEffectInstance.h
@@ -11,6 +11,9 @@ private:
 	int duration;
 	// sent as byte
 	int amplifier;
+	bool splash;
+	bool ambient;
+	bool noCounter;
 
 	void _init(int id, int duration, int amplifier);
 
@@ -18,19 +21,25 @@ public:
 	MobEffectInstance(int id);
 	MobEffectInstance(int id, int duration);
 	MobEffectInstance(int id, int duration, int amplifier);
+	MobEffectInstance(int id, int duration, int amplifier, bool ambient);
 	MobEffectInstance(MobEffectInstance *copy);
 
 	void update(MobEffectInstance *takeOver);
 	int getId();
 	int getDuration();
 	int getAmplifier();
-	bool tick(shared_ptr<Mob> target);
+
+	bool isSplash();
+	void setSplash(bool splash);
+	bool isAmbient();
+
+	bool tick(shared_ptr<LivingEntity> target);
 
 private:
 	int tickDownDuration();
 
 public:
-	void applyEffect(shared_ptr<Mob> mob);
+	void applyEffect(shared_ptr<LivingEntity> mob);
 	int getDescriptionId();
 	int getPostfixDescriptionId(); // 4J Added
 	int hashCode();
@@ -39,4 +48,9 @@ public:
 
 	// Was bool equals(Object obj)
 	bool equals(MobEffectInstance *obj);
+
+	CompoundTag *save(CompoundTag *tag);
+	static MobEffectInstance *load(CompoundTag *tag);
+	void setNoCounter(bool noCounter);
+	bool isNoCounter();
 };
\ No newline at end of file