papermc/Spigot-Server-Patches/0242-Fix-Dragon-Server-Crashes.patch

25 lines
1.3 KiB
Diff
Raw Normal View History

From cf49a77d720e289f094cb4e31e44d3053ef90e90 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Mar 2018 20:52:07 -0400
Subject: [PATCH] Fix Dragon Server Crashes
If the dragon tries to find "ground" and hits a hole, or off edge,
it will infinitely keep looking for non air and eventually crash.
diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
index da89a69ed..45f96078c 100644
--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
+++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
@@ -49,7 +49,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
double d2 = this.a.bD.locY + (double)(this.a.bD.length / 2.0F);
BlockPosition.MutableBlockPosition blockposition$mutableblockposition = new BlockPosition.MutableBlockPosition(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
- while(this.a.world.isEmpty(blockposition$mutableblockposition)) {
+ while(this.a.world.isEmpty(blockposition$mutableblockposition) && d2 > 0) { // Paper
--d2;
blockposition$mutableblockposition.c(MathHelper.floor(d0), MathHelper.floor(d2), MathHelper.floor(d1));
}
--
2.20.0