lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed the GC issues

Browse source
This commit is contained in:
WayofTime 2014-03-07 14:17:06 -05:00
parent b34ff3c58e
commit 5a4bb6e8e8
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
BM_src/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file

@ -145,6 +145,7 @@ public class AlchemicalWizardry
public static boolean isThaumcraftLoaded;
public static boolean isForestryLoaded;
public static boolean isGCLoaded;
public static CreativeTabs tabBloodMagic = new CreativeTabs("tabBloodMagic")
{
@ -958,5 +959,13 @@ public class AlchemicalWizardry
{
this.isForestryLoaded = false;
}
if(Loader.isModLoaded("GalacticraftCore"))
{
this.isGCLoaded = true;
}else
{
this.isGCLoaded = false;
}
}
}

5
BM_src/WayofTime/alchemicalWizardry/common/items/SacrificialDagger.java
View file

@ -66,11 +66,6 @@ public class SacrificialDagger extends Item
par2World.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3);
}
if (!par2World.isRemote && !(par3EntityPlayer.getClass().equals(EntityPlayerMP.class)))
{
return par1ItemStack;
}
findAndFillAltar(par2World, par3EntityPlayer, 200);
if (par3EntityPlayer.getHealth() <= 0.5f)

1
BM_src/WayofTime/alchemicalWizardry/common/items/potion/AlchemyFlask.java
View file

@ -39,6 +39,7 @@ public class AlchemyFlask extends Item
super(id);
this.setMaxDamage(8);
this.setMaxStackSize(1);
setNoRepair();
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
// TODO Auto-generated constructor stub
}

10
BM_src/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellHelper.java
View file

@ -3,6 +3,8 @@ package WayofTime.alchemicalWizardry.common.spell.complex.effect;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import micdoodle8.mods.galacticraft.core.entities.player.GCCorePlayerMP;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -116,13 +118,13 @@ public class SpellHelper
return false;
}
if(player instanceof FakePlayer)
if(player instanceof FakePlayer || player.username.contains("[CoFH]"))
{
return true;
}
String str = player.getClass().getCanonicalName();
if(str.contains("GCEntityPlayerMP"))
String str = player.getClass().getSimpleName();
if(str.contains("GC"))
{
return false;
}
@ -132,6 +134,6 @@ public class SpellHelper
return false;
}
return true;
return false;
}
}