diff options
| author | md_5 <git@md-5.net> | 2016-03-01 08:32:46 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-03-01 09:32:45 +1100 |
| commit | aa008dff0f9bedbe88e1fe79831776b0a52eb90a (patch) | |
| tree | cb520e0f4cc5d683fb9b7fb95de37480a7443dfb /nms-patches/EnchantmentThorns.patch | |
| parent | e1ebe524a78e27f6a2829ed4574fded3779094e1 (diff) | |
| download | craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.gz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.lz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.tar.xz craftbukkit-aa008dff0f9bedbe88e1fe79831776b0a52eb90a.zip | |
Update to Minecraft 1.9
Diffstat (limited to 'nms-patches/EnchantmentThorns.patch')
| -rw-r--r-- | nms-patches/EnchantmentThorns.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EnchantmentThorns.patch b/nms-patches/EnchantmentThorns.patch index 1329a104..82ffbcd9 100644 --- a/nms-patches/EnchantmentThorns.patch +++ b/nms-patches/EnchantmentThorns.patch @@ -1,11 +1,11 @@ --- 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); + Random random = entityliving.getRandom(); + ItemStack itemstack = EnchantmentManager.b(Enchantments.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); + } |