fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup and minor code tweaks

Browse Source
This commit is contained in:
Electroblob
2018-02-24 13:49:27 +00:00
parent 74ddcd79ca
commit 76d4e3d029
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/MindControl.java
+2 -2
View File
@@ -58,8 +58,8 @@ public class MindControl extends Spell {
if(!world.isRemote){
if(!canControl(target)){
// Adds a message saying that the player/boss entity/wizard resisted mind control
if(!world.isRemote) caster.sendMessage(new TextComponentTranslation("spell.resist",
target.getName(), this.getNameForTranslationFormatted()));
caster.sendMessage(new TextComponentTranslation("spell.resist", target.getName(),
this.getNameForTranslationFormatted()));
}else if(target instanceof EntityLiving){
src/main/java/electroblob/wizardry/spell/ShadowWard.java
+4 -4
View File
@@ -57,11 +57,11 @@ public class ShadowWard extends Spell {
&& !(event.getSource() instanceof IElementalDamage && ((IElementalDamage)event.getSource()).isRetaliatory())){
event.setCanceled(true);
// Now we can preserve the original daage source (sort of) as long as we make it retaliatory.
// Now we can preserve the original damage source (sort of) as long as we make it retaliatory.
event.getEntityLiving().attackEntityFrom(
MagicDamage.causeDirectMagicDamage(event.getSource().getTrueSource(), DamageType.MAGIC, true), event.getAmount() / 2);
((EntityLivingBase)event.getSource().getTrueSource())
.attackEntityFrom(MagicDamage.causeDirectMagicDamage(event.getEntityLiving(), DamageType.MAGIC, true), event.getAmount() / 2);
MagicDamage.causeDirectMagicDamage(event.getSource().getTrueSource(), DamageType.MAGIC, true), event.getAmount() * 0.5f);
((EntityLivingBase)event.getSource().getTrueSource()).attackEntityFrom(
MagicDamage.causeDirectMagicDamage(event.getEntityLiving(), DamageType.MAGIC, true), event.getAmount() * 0.5f);
}
}
}