mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Fixed the golden laurel crown destroying your amulet slot item rather than itself. Closes #1954
This commit is contained in:
1 parent
cbac610fb4
commit
751ce655ba
1 file changed
+3
-3
@@ -44,15 +44,15 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender {
|
||||
public void onPlayerDeath(LivingDeathEvent event) {
|
||||
if(event.getEntityLiving() instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
|
||||
ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(4);
|
||||
ItemStack headgear = BaublesApi.getBaubles(player).getStackInSlot(4);
|
||||
|
||||
if(amulet != null && amulet.getItem() == this) {
|
||||
if(headgear != null && headgear.getItem() == this) {
|
||||
event.setCanceled(true);
|
||||
player.setHealth(player.getMaxHealth());
|
||||
player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6));
|
||||
player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel"));
|
||||
player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F);
|
||||
BaublesApi.getBaubles(player).setInventorySlotContents(0, null);
|
||||
BaublesApi.getBaubles(player).setInventorySlotContents(4, null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user