30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From d8413b16c197862cbf7787bddb9e0900984772de 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 c5fdd6d..b1521b6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1308,7 +1308,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
break;
|
|
}
|
|
}
|
|
- collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
|
|
+ // 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" );
|
|
+ }
|
|
+ collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", healthMod, 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
|
|
+ // Spigot end
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.5.0
|
|
|