spigot/CraftBukkit-Patches/0055-Prevent-a-crash-involving-attributes.patch

31 lines
1.3 KiB
Diff
Raw Permalink Normal View History

From 4622d9bb5c831f30acd3b0a07622d33eda3b85bb Mon Sep 17 00:00:00 2001
2020-06-25 10:00:00 +10:00
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 5b6612680..0d1e75650 100644
2020-06-25 10:00:00 +10:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2164,7 +2164,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2020-06-25 10:00:00 +10:00
}
}
2020-07-01 14:22:35 +10:00
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });
2021-11-22 09:00:00 +11:00
- dummy.setBaseValue(scaledHealth ? healthScale : getMaxHealth());
2020-06-26 19:18:18 +10:00
+ // Spigot start
+ double healthMod = scaledHealth ? healthScale : getMaxHealth();
+ if ( healthMod >= Float.MAX_VALUE || healthMod <= 0 )
+ {
+ healthMod = 20; // Reset health
+ getServer().getLogger().warning( getName() + " tried to crash the server with a large health attribute" );
+ }
2021-11-22 09:00:00 +11:00
+ dummy.setBaseValue(healthMod);
2020-06-26 19:18:18 +10:00
+ // Spigot end
collection.add(dummy);
}
2020-06-25 10:00:00 +10:00
--
2.50.1
2020-06-25 10:00:00 +10:00