PaperMC/nms-patches/EnchantmentThorns.patch

12 lines
490 B
Diff
Raw Normal View History

2015-05-25 20:37:24 +10:00
--- a/net/minecraft/server/EnchantmentThorns.java
+++ b/net/minecraft/server/EnchantmentThorns.java
2014-12-10 15:57:27 +11:00
@@ -29,7 +29,7 @@
2016-03-01 08:32:46 +11:00
Random random = entityliving.getRandom();
ItemStack itemstack = EnchantmentManager.b(Enchantments.THORNS, entityliving);
2014-12-10 15:57:27 +11:00
- if (a(i, random)) {
+ if (entity != null && a(i, random)) { // CraftBukkit
2015-02-26 22:41:06 +00:00
if (entity != null) {
entity.damageEntity(DamageSource.a(entityliving), (float) b(i, random));
2016-03-01 08:32:46 +11:00
}