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

Removed all usages of PleaseStopUsingMe

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-17 22:30:14 -07:00
parent 77e5beb9e1
commit f535e331dd
10 changed files with 21 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/core/data/SoulNetwork.java
View file

@ -1,7 +1,7 @@
package WayofTime.bloodmagic.core.data;
import WayofTime.bloodmagic.util.BMLog;
import WayofTime.bloodmagic.util.PleaseStopUsingMe;
import WayofTime.bloodmagic.util.DamageSourceBloodMagic;
import WayofTime.bloodmagic.event.AddToNetworkEvent;
import WayofTime.bloodmagic.event.SoulNetworkEvent;
import WayofTime.bloodmagic.util.helper.PlayerHelper;
@ -113,14 +113,14 @@ public class SoulNetwork implements INBTSerializable<NBTTagCompound> {
if (syphon < 100 && syphon > 0) {
if (!user.capabilities.isCreativeMode) {
user.hurtResistantTime = 0;
user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F);
user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F);
}
} else if (syphon >= 100) {
if (!user.capabilities.isCreativeMode) {
for (int i = 0; i < ((syphon + 99) / 100); i++) {
user.hurtResistantTime = 0;
user.attackEntityFrom(PleaseStopUsingMe.damageSource, 1.0F);
user.attackEntityFrom(DamageSourceBloodMagic.INSTANCE, 1.0F);
}
}
}