forked from Brandon/MythicNetwork
12 lines
531 B
Diff
12 lines
531 B
Diff
|
--- a/net/minecraft/server/EnchantmentThorns.java
|
||
|
|
+++ b/net/minecraft/server/EnchantmentThorns.java
|
||
|
|
@@ -29,7 +29,7 @@
|
||
|
|
Random random = entityliving.bc();
|
||
|
|
ItemStack itemstack = EnchantmentManager.a(Enchantment.THORNS, entityliving);
|
||
|
|
|
||
|
|
- if (a(i, random)) {
|
||
|
|
+ if (entity != null && a(i, random)) { // CraftBukkit
|
||
|
|
if (entity != null) {
|
||
|
|
entity.damageEntity(DamageSource.a(entityliving), (float) b(i, random));
|
||
|
|
entity.makeSound("damage.thorns", 0.5F, 1.0F);
|