Config MobEffect by world

patches/server/0167-Config-MobEffect-by-world.patch

@@ -1,99 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: DoctaEnkoda <bierquejason@gmail.com>
-Date: Sat, 23 Sep 2023 03:59:15 -0700
-Subject: [PATCH] Config MobEffect by world
-
-
-diff --git a/net/minecraft/world/effect/HungerMobEffect.java b/net/minecraft/world/effect/HungerMobEffect.java
-index 11d1ee8fae7670f02cb3f5d57f4774dbde77f48c..88cf1353892a7ead4e0f16822216b151726ac0e4 100644
---- a/net/minecraft/world/effect/HungerMobEffect.java
-+++ b/net/minecraft/world/effect/HungerMobEffect.java
-@@ -13,7 +13,7 @@ class HungerMobEffect extends MobEffect {
-     @Override
-     public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
-         if (entity instanceof Player entityhuman) {
--            entityhuman.causeFoodExhaustion(0.005F * (float) (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent
-+            entityhuman.causeFoodExhaustion(entity.level().purpurConfig.humanHungerExhaustionAmount * (float) (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent // Purpur
-         }
- 
-         return true;
-diff --git a/net/minecraft/world/effect/PoisonMobEffect.java b/net/minecraft/world/effect/PoisonMobEffect.java
-index 3f1e59229d6a71117700a56c87914bc9401f1da2..32c8474ffa88e997bb484caecb21e3dc98991e70 100644
---- a/net/minecraft/world/effect/PoisonMobEffect.java
-+++ b/net/minecraft/world/effect/PoisonMobEffect.java
-@@ -13,8 +13,8 @@ public class PoisonMobEffect extends MobEffect {
- 
-     @Override
-     public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
--        if (entity.getHealth() > 1.0F) {
--            entity.hurtServer(world, entity.damageSources().poison(), 1.0F);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON
-+        if (entity.getHealth() > entity.level().purpurConfig.entityMinimalHealthPoison) { // Purpur
-+            entity.hurtServer(world, entity.damageSources().poison(), entity.level().purpurConfig.entityPoisonDegenerationAmount);  // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON // Purpur
-         }
- 
-         return true;
-diff --git a/net/minecraft/world/effect/RegenerationMobEffect.java b/net/minecraft/world/effect/RegenerationMobEffect.java
-index b43e573e91d1f1b407774bb2d60ee5f099f171e7..25aa932fc03eeebc5aabca6c5eae0cbfc8ad8396 100644
---- a/net/minecraft/world/effect/RegenerationMobEffect.java
-+++ b/net/minecraft/world/effect/RegenerationMobEffect.java
-@@ -12,7 +12,7 @@ class RegenerationMobEffect extends MobEffect {
-     @Override
-     public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
-         if (entity.getHealth() < entity.getMaxHealth()) {
--            entity.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit
-+            entity.heal(entity.level().purpurConfig.entityHealthRegenAmount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit // Purpur
-         }
- 
-         return true;
-diff --git a/net/minecraft/world/effect/SaturationMobEffect.java b/net/minecraft/world/effect/SaturationMobEffect.java
-index 98b74649a667fb9b10afef0ba5383a73022d8c71..837bdc7d6bd4e05b0deded829c678c86ae3d79d5 100644
---- a/net/minecraft/world/effect/SaturationMobEffect.java
-+++ b/net/minecraft/world/effect/SaturationMobEffect.java
-@@ -21,7 +21,7 @@ class SaturationMobEffect extends InstantenousMobEffect {
-             int oldFoodLevel = entityhuman.getFoodData().foodLevel;
-             org.bukkit.event.entity.FoodLevelChangeEvent event = CraftEventFactory.callFoodLevelChangeEvent(entityhuman, amplifier + 1 + oldFoodLevel);
-             if (!event.isCancelled()) {
--                entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 1.0F);
-+                entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, entity.level().purpurConfig.humanSaturationRegenAmount); // Purpur
-             }
- 
-             ((CraftPlayer) entityhuman.getBukkitEntity()).sendHealthUpdate();
-diff --git a/net/minecraft/world/effect/WitherMobEffect.java b/net/minecraft/world/effect/WitherMobEffect.java
-index 55132e6e064ddd15b26286eca335305ed57b2f9e..1e04947995009689315352b79989e7ce4e20073c 100644
---- a/net/minecraft/world/effect/WitherMobEffect.java
-+++ b/net/minecraft/world/effect/WitherMobEffect.java
-@@ -12,7 +12,7 @@ public class WitherMobEffect extends MobEffect {
- 
-     @Override
-     public boolean applyEffectTick(ServerLevel world, LivingEntity entity, int amplifier) {
--        entity.hurtServer(world, entity.damageSources().wither(), 1.0F);
-+        entity.hurtServer(world, entity.damageSources().wither(), entity.level().purpurConfig.entityWitherDegenerationAmount); // Purpur
-         return true;
-     }
- 
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8eaff3384ed2fa6b4f557e82b6c0f89fa8ae7cb4..b279cd51d5661c304bff6a2638bf39df0e3cf952 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -326,6 +326,21 @@ public class PurpurWorldConfig {
-         poweredRailBoostModifier = getDouble("gameplay-mechanics.minecart.powered-rail.boost-modifier", poweredRailBoostModifier);
-     }
- 
-+    public float entityHealthRegenAmount = 1.0F;
-+    public float entityMinimalHealthPoison = 1.0F;
-+    public float entityPoisonDegenerationAmount = 1.0F;
-+    public float entityWitherDegenerationAmount = 1.0F;
-+    public float humanHungerExhaustionAmount = 0.005F;
-+    public float humanSaturationRegenAmount = 1.0F;
-+    private void mobEffectSettings() {
-+        entityHealthRegenAmount = (float) getDouble("gameplay-mechanics.mob-effects.health-regen-amount", entityHealthRegenAmount);
-+        entityMinimalHealthPoison = (float) getDouble("gameplay-mechanics.mob-effects.minimal-health-poison-amount", entityMinimalHealthPoison);
-+        entityPoisonDegenerationAmount = (float) getDouble("gameplay-mechanics.mob-effects.poison-degeneration-amount", entityPoisonDegenerationAmount);
-+        entityWitherDegenerationAmount = (float) getDouble("gameplay-mechanics.mob-effects.wither-degeneration-amount", entityWitherDegenerationAmount);
-+        humanHungerExhaustionAmount = (float) getDouble("gameplay-mechanics.mob-effects.hunger-exhaustion-amount", humanHungerExhaustionAmount);
-+        humanSaturationRegenAmount = (float) getDouble("gameplay-mechanics.mob-effects.saturation-regen-amount", humanSaturationRegenAmount);
-+    }
-+
-     public boolean catSpawning;
-     public boolean patrolSpawning;
-     public boolean phantomSpawning;

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/HungerMobEffect.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/effect/HungerMobEffect.java
++++ b/net/minecraft/world/effect/HungerMobEffect.java
+@@ -12,7 +_,7 @@
+     @Override
+     public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
+         if (entity instanceof Player player) {
+-            player.causeFoodExhaustion(0.005F * (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent
++            player.causeFoodExhaustion(entity.level().purpurConfig.humanHungerExhaustionAmount * (amplifier + 1), org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.HUNGER_EFFECT); // CraftBukkit - EntityExhaustionEvent // Purpur - Config MobEffect by world
+         }
+ 
+         return true;

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/PoisonMobEffect.java.patch

@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/effect/PoisonMobEffect.java
++++ b/net/minecraft/world/effect/PoisonMobEffect.java
+@@ -12,8 +_,8 @@
+ 
+     @Override
+     public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
+-        if (entity.getHealth() > 1.0F) {
+-            entity.hurtServer(level, entity.damageSources().poison(), 1.0F); // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON
++        if (entity.getHealth() > entity.level().purpurConfig.entityMinimalHealthPoison) { // Purpur
++            entity.hurtServer(level, entity.damageSources().poison(), entity.level().purpurConfig.entityPoisonDegenerationAmount); // CraftBukkit - DamageSource.MAGIC -> CraftEventFactory.POISON // Purpur - Config MobEffect by world
+         }
+ 
+         return true;

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/RegenerationMobEffect.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/effect/RegenerationMobEffect.java
++++ b/net/minecraft/world/effect/RegenerationMobEffect.java
+@@ -11,7 +_,7 @@
+     @Override
+     public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
+         if (entity.getHealth() < entity.getMaxHealth()) {
+-            entity.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit
++            entity.heal(entity.level().purpurConfig.entityHealthRegenAmount, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.MAGIC_REGEN); // CraftBukkit // Purpur - Config MobEffect by world
+         }
+ 
+         return true;

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/SaturationMobEffect.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/effect/SaturationMobEffect.java
++++ b/net/minecraft/world/effect/SaturationMobEffect.java
+@@ -16,7 +_,7 @@
+             int oldFoodLevel = player.getFoodData().foodLevel;
+             org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, amplifier + 1 + oldFoodLevel);
+             if (!event.isCancelled()) {
+-                player.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 1.0F);
++                player.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, entity.level().purpurConfig.humanSaturationRegenAmount); // Purpur - Config MobEffect by world
+             }
+ 
+             ((org.bukkit.craftbukkit.entity.CraftPlayer) player.getBukkitEntity()).sendHealthUpdate();

purpur-server/minecraft-patches/sources/net/minecraft/world/effect/WitherMobEffect.java.patch

@@ -0,0 +1,11 @@
+--- a/net/minecraft/world/effect/WitherMobEffect.java
++++ b/net/minecraft/world/effect/WitherMobEffect.java
+@@ -12,7 +_,7 @@
+ 
+     @Override
+     public boolean applyEffectTick(ServerLevel level, LivingEntity entity, int amplifier) {
+-        entity.hurtServer(level, entity.damageSources().wither(), 1.0F);
++        entity.hurtServer(level, entity.damageSources().wither(), entity.level().purpurConfig.entityWitherDegenerationAmount); // Purpur - Config MobEffect by world
+         return true;
+     }
+ 

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

@@ -318,6 +318,21 @@ public class PurpurWorldConfig {
         poweredRailBoostModifier = getDouble("gameplay-mechanics.minecart.powered-rail.boost-modifier", poweredRailBoostModifier);
     }
 
+    public float entityHealthRegenAmount = 1.0F;
+    public float entityMinimalHealthPoison = 1.0F;
+    public float entityPoisonDegenerationAmount = 1.0F;
+    public float entityWitherDegenerationAmount = 1.0F;
+    public float humanHungerExhaustionAmount = 0.005F;
+    public float humanSaturationRegenAmount = 1.0F;
+    private void mobEffectSettings() {
+        entityHealthRegenAmount = (float) getDouble("gameplay-mechanics.mob-effects.health-regen-amount", entityHealthRegenAmount);
+        entityMinimalHealthPoison = (float) getDouble("gameplay-mechanics.mob-effects.minimal-health-poison-amount", entityMinimalHealthPoison);
+        entityPoisonDegenerationAmount = (float) getDouble("gameplay-mechanics.mob-effects.poison-degeneration-amount", entityPoisonDegenerationAmount);
+        entityWitherDegenerationAmount = (float) getDouble("gameplay-mechanics.mob-effects.wither-degeneration-amount", entityWitherDegenerationAmount);
+        humanHungerExhaustionAmount = (float) getDouble("gameplay-mechanics.mob-effects.hunger-exhaustion-amount", humanHungerExhaustionAmount);
+        humanSaturationRegenAmount = (float) getDouble("gameplay-mechanics.mob-effects.saturation-regen-amount", humanSaturationRegenAmount);
+    }
+
     public boolean catSpawning;
     public boolean patrolSpawning;
     public boolean phantomSpawning;