mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-07-03 17:57:29 +00:00
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 11955edc3ad8f69f5001fafb33a1eb006e6046db Mon Sep 17 00:00:00 2001
|
|
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 291df669a..00583d590 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2162,7 +2162,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
}
|
|
}
|
|
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });
|
|
- dummy.setBaseValue(scaledHealth ? healthScale : getMaxHealth());
|
|
+ // 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" );
|
|
+ }
|
|
+ dummy.setBaseValue(healthMod);
|
|
+ // Spigot end
|
|
collection.add(dummy);
|
|
}
|
|
|
|
--
|
|
2.49.0
|
|
|