From 996ec9a7f7c946360810be710130d7545aba2d11 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Mon, 13 Jan 2020 18:54:43 +0000
Subject: [PATCH] Electroblob hit the ground too hard

---
 src/main/java/electroblob/wizardry/WizardryEventHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/electroblob/wizardry/WizardryEventHandler.java b/src/main/java/electroblob/wizardry/WizardryEventHandler.java
index 05c9077e..5437b675 100644
--- a/src/main/java/electroblob/wizardry/WizardryEventHandler.java
+++ b/src/main/java/electroblob/wizardry/WizardryEventHandler.java
@@ -464,7 +464,8 @@ public final class WizardryEventHandler {
 //					Wizardry.logger.info("Replaced fall distance {} with effective distance {} based on entity velocity", event.getDistance(), y);
 //				}
 
-				event.setDistance((float)y);
+				// Don't let it increase fall damage beyond vanilla values
+				if(y < event.getDistance()) event.setDistance((float)y);
 			}
 		}
 	}