Drowning Settings

patches/server/0140-Drowning-Settings.patch

@@ -1,61 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ben Kerllenevich <ben@omega24.dev>
-Date: Sun, 21 Mar 2021 15:26:52 -0400
-Subject: [PATCH] Drowning Settings
-
-
-diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index f15a8c14417b83b237dc7b9a11490116314cd4c6..a5f4f5d915a864240fd738ca32872829bfcabb41 100644
---- a/net/minecraft/world/entity/Entity.java
-+++ b/net/minecraft/world/entity/Entity.java
-@@ -3692,7 +3692,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
- 
-     public int getMaxAirSupply() {
--        return this.maxAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
-+        return this.level == null? this.maxAirTicks : this.level().purpurConfig.drowningAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir() // Purpur
-     }
- 
-     public int getAirSupply() {
-diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 7b60c84df74cb542e2da3c8d81383cc4afc47a55..dc0656378d81a77e1d49895a90f92f27e3e247f3 100644
---- a/net/minecraft/world/entity/LivingEntity.java
-+++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -489,7 +489,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- 
-                 if (flag1) {
-                     this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
--                    if (this.getAirSupply() == -20) {
-+                    if (this.getAirSupply() == -this.level().purpurConfig.drowningDamageInterval) { // Purpur
-                         this.setAirSupply(0);
-                         Vec3 vec3d = this.getDeltaMovement();
- 
-@@ -501,7 +501,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
-                             this.level().addParticle(ParticleTypes.BUBBLE, this.getX() + d0, this.getY() + d2, this.getZ() + d3, vec3d.x, vec3d.y, vec3d.z);
-                         }
- 
--                        this.hurt(this.damageSources().drown(), 2.0F);
-+                        this.hurt(this.damageSources().drown(), (float) this.level().purpurConfig.damageFromDrowning); // Purpur
-                     }
-                 } else if (this.getAirSupply() < this.getMaxAirSupply()) {
-                     this.setAirSupply(this.increaseAirSupply(this.getAirSupply()));
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 913c3e0c66d005380782af7e7a3358ed5ef45afc..693f84494c622697b4803f81ee81e21c59a7ebe6 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -165,6 +165,15 @@ public class PurpurWorldConfig {
-         nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks);
-     }
- 
-+    public int drowningAirTicks = 300;
-+    public int drowningDamageInterval = 20;
-+    public double damageFromDrowning = 2.0F;
-+    private void drowningSettings() {
-+        drowningAirTicks = getInt("gameplay-mechanics.drowning.air-ticks", drowningAirTicks);
-+        drowningDamageInterval = getInt("gameplay-mechanics.drowning.ticks-per-damage", drowningDamageInterval);
-+        damageFromDrowning = getDouble("gameplay-mechanics.drowning.damage-from-drowning", damageFromDrowning);
-+    }
-+
-     public int elytraDamagePerSecond = 1;
-     public double elytraDamageMultiplyBySpeed = 0;
-     public int elytraDamagePerFireworkBoost = 0;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -67,6 +67,15 @@
              }
          }
      }
+@@ -3460,7 +_,7 @@
+     }
+ 
+     public int getMaxAirSupply() {
+-        return this.maxAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
++        return this.level == null? this.maxAirTicks : this.level().purpurConfig.drowningAirTicks; // CraftBukkit - SPIGOT-6907: re-implement LivingEntity#setMaximumAir() // Purpur - Drowning Settings
+     }
+ 
+     public int getAirSupply() {
 @@ -3955,7 +_,7 @@
      // CraftBukkit end
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch

@@ -13,6 +13,24 @@
                              this.hurtServer(serverLevel1, this.damageSources().outOfBorder(), Math.max(1, Mth.floor(-d * damagePerBlock)));
                          }
                      }
+@@ -472,7 +_,7 @@
+                     && (!flag || !((Player)this).getAbilities().invulnerable);
+                 if (flag1) {
+                     this.setAirSupply(this.decreaseAirSupply(this.getAirSupply()));
+-                    if (this.getAirSupply() == -20) {
++                    if (this.getAirSupply() == -this.level().purpurConfig.drowningDamageInterval) { // Purpur - Drowning Settings
+                         this.setAirSupply(0);
+                         Vec3 deltaMovement = this.getDeltaMovement();
+ 
+@@ -492,7 +_,7 @@
+                                 );
+                         }
+ 
+-                        this.hurt(this.damageSources().drown(), 2.0F);
++                        this.hurt(this.damageSources().drown(), (float) this.level().purpurConfig.damageFromDrowning); // Purpur - Drowning Settings
+                     }
+                 } else if (this.getAirSupply() < this.getMaxAirSupply()) {
+                     this.setAirSupply(this.increaseAirSupply(this.getAirSupply()));
 @@ -1372,6 +_,24 @@
                  this.stopSleeping();
              }

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

@@ -157,6 +157,15 @@ public class PurpurWorldConfig {
         nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks);
     }
 
+    public int drowningAirTicks = 300;
+    public int drowningDamageInterval = 20;
+    public double damageFromDrowning = 2.0F;
+    private void drowningSettings() {
+        drowningAirTicks = getInt("gameplay-mechanics.drowning.air-ticks", drowningAirTicks);
+        drowningDamageInterval = getInt("gameplay-mechanics.drowning.ticks-per-damage", drowningDamageInterval);
+        damageFromDrowning = getDouble("gameplay-mechanics.drowning.damage-from-drowning", damageFromDrowning);
+    }
+
     public int elytraDamagePerSecond = 1;
     public double elytraDamageMultiplyBySpeed = 0;
     public int elytraDamagePerFireworkBoost = 0;