2018-07-04 15:55:24 +08:00
|
|
|
From a98fa1d1bf527e9056477711ad1e3bfef9e5b7b2 Mon Sep 17 00:00:00 2001
|
2018-03-22 08:51:12 +08:00
|
|
|
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
|
2018-06-30 13:40:52 +08:00
|
|
|
index 054a7ef6c..deee5c4cc 100644
|
2018-03-22 08:51:12 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
|
|
|
|
@@ -51,7 +51,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
|
|
|
|
double d2 = this.a.bw.locY + (double) (this.a.bw.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));
|
|
|
|
}
|
|
|
|
--
|
2018-06-30 13:40:52 +08:00
|
|
|
2.18.0
|
2018-03-22 08:51:12 +08:00
|
|
|
|