PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make the damage source static

Browse source
This commit is contained in:
Sollace 2019-02-19 12:09:39 +02:00
parent 18594d1f9a
commit ee84215649
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java
View file

@ -40,6 +40,10 @@ import net.minecraft.world.World;
public class ItemAlicornAmulet extends ItemArmor implements IDependable {
public static final DamageSource DAMAGE_SOURCE = MagicalDamageSource.create("alicorn_amulet")
.setDamageBypassesArmor()
.setDamageIsAbsolute();
private static final UUID[] ARMOR_MODIFIERS = new UUID[] {
UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"),
UUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"),
@ -196,9 +200,7 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable {
if (attachedTime > 13000) {
if (world.rand.nextInt(300) == 0) {
DamageSource source = MagicalDamageSource.causePlayerDamage("alicorn_amulet", player);
player.attackEntityFrom(source, 1F);
player.attackEntityFrom(DAMAGE_SOURCE, 1F);
}
}
@ -210,14 +212,12 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable {
float attachedTime = player.getInventory().getTicksAttached(this) / 100F;
DamageSource source = MagicalDamageSource.causePlayerDamage("alicorn_amulet", player.getOwner());
DifficultyInstance difficulty = player.getWorld().getDifficultyForLocation(player.getOrigin());
float amount = (attachedTime * (1 + needfulness)) * (1 + difficulty.getClampedAdditionalDifficulty());
amount = Math.min(amount, player.getOwner().getMaxHealth());
player.getOwner().attackEntityFrom(source, amount);
player.getOwner().attackEntityFrom(DAMAGE_SOURCE, amount);
if (attachedTime > 120) {
player.getOwner().knockBack(player.getOwner(), 1, 1, 1);