From c424d15b32f1f55f09d10aa317a0f84fc3542b48 Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Tue, 10 May 2022 01:48:27 -0700 Subject: [PATCH] Remove previous fix for falling to death in godmode This fix is more efficient --- .../server/packet/recv/HandlerCombatInvocationsNotify.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java index 04604ddc1..95171bec8 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java @@ -105,10 +105,6 @@ public class HandlerCombatInvocationsNotify extends PacketHandler { if (cachedLandingSpeed < -28) { damageFactor = 1f; } - // Disable falling damage for players in god mode. - if (session.getPlayer() != null && session.getPlayer().inGodmode()) { - damageFactor = 0; - } float damage = maxHP * damageFactor; float newHP = currentHP - damage; if (newHP < 0) {