mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 20:52:20 +00:00
Merge branch 'master' of github.com:Vazkii/Botania into 1.12
This commit is contained in:
commit
1fb517ef5b
21 files changed
+19
-15
No files matched your search
@@ -239,7 +239,7 @@ public class EntitySpark extends Entity implements ISparkEntity {
|
||||
@Override
|
||||
public boolean processInitialInteract(EntityPlayer player, EnumHand hand) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!stack.isEmpty()) {
|
||||
if(!isDead && !stack.isEmpty()) {
|
||||
if(world.isRemote) {
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade
|
||||
|| stack.getItem() == ModItems.phantomInk;
|
||||
|
||||
Reference in new issue
Block a user