PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-25 14:14:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed gems dropping an item of the wrong affinity

Browse source
This commit is contained in:
Sollace 2019-02-04 22:09:36 +02:00
parent 4033b48e24
commit c06c6c6a05
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
View file

@ -18,6 +18,7 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents; import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataParameter;
@ -99,11 +100,15 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
} }
public ItemStack onPlayerMiddleClick(EntityPlayer player) { public ItemStack onPlayerMiddleClick(EntityPlayer player) {
ItemStack stack = new ItemStack(UItems.spell, 1); ItemStack stack = new ItemStack(getItem(), 1);
SpellRegistry.instance().enchantStack(stack, getEffect().getName()); SpellRegistry.instance().enchantStack(stack, getEffect().getName());
return stack; return stack;
} }
protected Item getItem() {
return getAffinity() == SpellAffinity.BAD ? UItems.curse : UItems.spell;
}
@Override @Override
protected boolean canTriggerWalking() { protected boolean canTriggerWalking() {
return false; return false;
@ -226,7 +231,7 @@ public class EntitySpell extends EntityLiving implements IMagicals, ICaster<Enti
if (world.getGameRules().getBoolean("doTileDrops")) { if (world.getGameRules().getBoolean("doTileDrops")) {
int level = getCurrentLevel(); int level = getCurrentLevel();
ItemStack stack = new ItemStack(UItems.spell, level + 1); ItemStack stack = new ItemStack(getItem(), level + 1);
if (hasEffect()) { if (hasEffect()) {
SpellRegistry.instance().enchantStack(stack, getEffect().getName()); SpellRegistry.instance().enchantStack(stack, getEffect().getName());
} }