Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-23 04:47:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git@dev.lumine.io:7999/mmo/mmoitems.git

Browse Source
This commit is contained in:
Aria 2019-10-01 20:31:56 +02:00
commit 2c8bfebedd
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/Indyuce/mmoitems/ability/Magical_Path.java
View File

@ -73,8 +73,8 @@ public class Magical_Path extends Ability {
event.setCancelled(true);
safe = false;
player.getWorld().spawnParticle(Particle.SPELL, player.getLocation(), 16, .5, 0, .5, .1);
player.getWorld().spawnParticle(Particle.SPELL_INSTANT, player.getLocation(), 32, .5, 0, .5, .1);
player.getWorld().spawnParticle(Particle.SPELL, player.getLocation(), 8, .35, 0, .35, .08);
player.getWorld().spawnParticle(Particle.SPELL_INSTANT, player.getLocation(), 16, .35, 0, .35, .08);
player.getWorld().playSound(player.getLocation(), VersionSound.ENTITY_ENDERMAN_HURT.toSound(), 1, 2);
}
}

24
src/main/java/net/Indyuce/mmoitems/stat/Staff_Spirit.java
View File

@ -51,7 +51,7 @@ public class Staff_Spirit extends StringStat {
try {
StaffSpirit staffSpirit = StaffSpirit.valueOf(((StringData) data).toString().toUpperCase().replace(" ", "_").replace("-", "_"));
item.addItemTag(new ItemTag("MMOITEMS_STAFF_SPIRIT", staffSpirit.name()));
item.getLore().insert("staff-spirit", staffSpirit.getPrefix() + staffSpirit.getName());
item.getLore().insert("staff-spirit", staffSpirit.getName());
} catch (Exception e) {
item.getMMOItem().log(Level.WARNING, "Couldn't read staff spirit from " + ((StringData) data).toString());
}
@ -59,24 +59,22 @@ public class Staff_Spirit extends StringStat {
}
public enum StaffSpirit {
NETHER_SPIRIT(ChatColor.GOLD, "Nether Spirit", "Shoots fire beams.", new NetherSpirit()),
VOID_SPIRIT(ChatColor.DARK_GRAY, "Void Spirit", "Shoots shulker missiles.", new VoidSpirit()),
MANA_SPIRIT(ChatColor.BLUE, "Mana Spirit", "Summons mana bolts.", new ManaSpirit()),
LIGHTNING_SPIRIT(ChatColor.WHITE, "Lightning Spirit", "Summons lightning bolts.", new LightningSpirit()),
XRAY_SPIRIT(ChatColor.RED, "X-Ray Spirit", "Fires piercing & powerful X-rays.", new XRaySpirit()),
THUNDER_SPIRIT(ChatColor.YELLOW, "Thunder Spirit", "Fires AoE damaging thunder strikes.", new ThunderSpirit()),
SUNFIRE_SPIRIT(ChatColor.RED, "Sunfire Spirit", "Fires AoE damaging fire comets.", new SunfireSpirit()),
NETHER_SPIRIT("Nether Spirit", "Shoots fire beams.", new NetherSpirit()),
VOID_SPIRIT("Void Spirit", "Shoots shulker missiles.", new VoidSpirit()),
MANA_SPIRIT("Mana Spirit", "Summons mana bolts.", new ManaSpirit()),
LIGHTNING_SPIRIT("Lightning Spirit", "Summons lightning bolts.", new LightningSpirit()),
XRAY_SPIRIT("X-Ray Spirit", "Fires piercing & powerful X-rays.", new XRaySpirit()),
THUNDER_SPIRIT("Thunder Spirit", "Fires AoE damaging thunder strikes.", new ThunderSpirit()),
SUNFIRE_SPIRIT("Sunfire Spirit", "Fires AoE damaging fire comets.", new SunfireSpirit()),
// CURSED_SPIRIT(ChatColor.DARK_PURPLE, "Cursed Spirit", "Fires a targeted cursed projectile."), new CursedSpirit()),
;
private final ChatColor prefix;
private final String lore;
private final StaffAttackHandler handler;
private String name;
private StaffSpirit(ChatColor prefix, String name, String lore, StaffAttackHandler handler) {
this.prefix = prefix;
private StaffSpirit(String name, String lore, StaffAttackHandler handler) {
this.name = name;
this.lore = lore;
this.handler = handler;
@ -90,10 +88,6 @@ public class Staff_Spirit extends StringStat {
}
}
public ChatColor getPrefix() {
return prefix;
}
public String getDefaultName() {
return name;
}