From 715519e1f13c0b4d29561101a6444e2bc79a0f55 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 19 May 2024 00:17:34 +0100
Subject: [PATCH] Increase energy cost when flying over the void. Fixes #356

---
 .../unicopia/entity/player/PlayerPhysics.java | 22 +++++++++++++------
 .../unicopia/util/PosHelper.java              |  4 ++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
index 8aed9af4..5229258f 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
@@ -393,7 +393,9 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
     private void tickGrounded() {
         prevStrafe = 0;
         strafe = 0;
-        ticksInAir = 0;
+        if (entity.isOnGround()) {
+            ticksInAir = 0;
+        }
         wallHitCooldown = MAX_WALL_HIT_CALLDOWN;
         soundPlaying = false;
         descentRate = 0;
@@ -524,9 +526,15 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
 
             mana.add(MathHelper.clamp(cost, -100, 0));
 
-            if (mana.getPercentFill() < 0.2) {
-                pony.getMagicalReserves().getExertion().addPercent(2);
-                pony.getMagicalReserves().getExhaustion().add(2 + (int)(getHorizontalMotion() * 50));
+            boolean overVoid = PosHelper.isOverVoid(pony.asWorld(), pony.getOrigin(), getGravitySignum());
+
+            if (overVoid) {
+                mana.addPercent(-2);
+            }
+
+            if (mana.getPercentFill() < (overVoid ? 0.4F : 0.2F)) {
+                pony.getMagicalReserves().getExertion().addPercent(overVoid ? 4 : 2);
+                pony.getMagicalReserves().getExhaustion().add((overVoid ? 4 : 0) + 2 + (int)(getHorizontalMotion() * 50));
 
                 if (mana.getPercentFill() < 0.1 && ticksInAir % 10 == 0) {
                     float exhaustion = (0.3F * ticksInAir) / 70;
@@ -537,10 +545,10 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
                     entity.addExhaustion(exhaustion);
                 }
 
-                if (pony.getMagicalReserves().getExhaustion().get() > 99 && ticksInAir % 25 == 0) {
-                    entity.damage(pony.damageOf(UDamageTypes.EXHAUSTION), 2);
+                if (pony.getMagicalReserves().getExhaustion().getPercentFill() > 0.99F && ticksInAir % 25 == 0 && !pony.isClient()) {
+                    entity.damage(pony.damageOf(UDamageTypes.EXHAUSTION), entity.getWorld().random.nextBetween(2, 4));
 
-                    if (entity.getWorld().random.nextInt(110) == 1 && !pony.isClient()) {
+                    if (entity.getWorld().random.nextInt(110) == 1) {
                         pony.getLevel().add(1);
                         if (Abilities.RAINBOOM.canUse(pony.getCompositeRace())) {
                             pony.getMagicalReserves().getCharge().addPercent(4);
diff --git a/src/main/java/com/minelittlepony/unicopia/util/PosHelper.java b/src/main/java/com/minelittlepony/unicopia/util/PosHelper.java
index 2cb644e4..f050c796 100644
--- a/src/main/java/com/minelittlepony/unicopia/util/PosHelper.java
+++ b/src/main/java/com/minelittlepony/unicopia/util/PosHelper.java
@@ -37,6 +37,10 @@ public interface PosHelper {
         return mutable.toImmutable();
     }
 
+    static boolean isOverVoid(World world, BlockPos pos, int signum) {
+        return signum > 0 && findSolidGroundAt(world, pos, signum).getY() < world.getBottomY();
+    }
+
     static void fastAll(BlockPos origin, Consumer<BlockPos.Mutable> consumer, Direction... directions) {
         final BlockPos immutable = origin instanceof BlockPos.Mutable m ? m.toImmutable() : origin;
         final BlockPos.Mutable mutable = origin instanceof BlockPos.Mutable m ? m : origin.mutableCopy();