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

31 lines
1.4 KiB
Diff
Raw Normal View History

From a19334167ae4751278c8d15b3f55027e25b5db46 Mon Sep 17 00:00:00 2001
2014-07-19 19:57:36 +01: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 5480607..d1f69dc 100644
2014-07-19 19:57:36 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1310,7 +1310,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2014-07-19 19:57:36 +01:00
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)));
2014-07-19 19:57:36 +01:00
+ // Spigot start
2014-07-19 20:24:30 +01:00
+ double healthMod = scaledHealth ? healthScale : getMaxHealth();
+ if ( healthMod >= Float.MAX_VALUE || healthMod <= 0 )
2014-07-19 19:57:36 +01:00
+ {
2014-07-19 20:24:30 +01:00
+ healthMod = 20; // Reset health
+ getServer().getLogger().warning( getName() + " tried to crash the server with a large health attribute" );
2014-07-19 19:57:36 +01:00
+ }
+ collection.add(new AttributeModifiable(getHandle().getAttributeMap(), (new AttributeRanged(null, "generic.maxHealth", healthMod, 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
2014-07-19 19:57:36 +01:00
+ // Spigot end
}
// Spigot start
--
2.1.0
2014-07-19 19:57:36 +01:00