JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Meridian Scepter

Browse Source
This commit is contained in:
samczsun 2016-05-19 19:09:04 -04:00 committed by Sam Sun
parent 1dc5a0d712
commit d8b5dba3fc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/MeridianScepter.java
View File

@ -21,6 +21,8 @@ import mineplex.core.common.util.UtilTime.TimeUnit;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.ClansManager;
import mineplex.minecraft.game.core.condition.Condition;
import mineplex.minecraft.game.core.condition.ConditionManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
@ -102,7 +104,7 @@ public class MeridianScepter extends LegendaryItem
// If they are less than 0.5 blocks away // If they are less than 0.5 blocks away
if (player.getEyeLocation().subtract(0, .3, 0).distance(projectile) <= 2) if (player.getEyeLocation().subtract(0, .3, 0).distance(projectile) <= 2)
{ {
AttackAnimation aa = new AttackAnimation(shooter, player); AttackAnimation aa = new AttackAnimation(player, shooter);
int i = UtilServer.getServer().getScheduler().scheduleSyncRepeatingTask(UtilServer.getPlugin(), () -> { int i = UtilServer.getServer().getScheduler().scheduleSyncRepeatingTask(UtilServer.getPlugin(), () -> {
aa.update(); aa.update();
}, 0, 1); }, 0, 1);
@ -290,7 +292,7 @@ public class MeridianScepter extends LegendaryItem
ClansManager.getInstance().getDamageManager().NewDamageEvent(_hit, _shooter, null, ClansManager.getInstance().getDamageManager().NewDamageEvent(_hit, _shooter, null,
DamageCause.CUSTOM, 6, false, true, true, DamageCause.CUSTOM, 6, false, true, true,
_shooter.getName(), "Meridian Scepter"); _shooter.getName(), "Meridian Scepter");
ClansManager.getInstance().getCondition().Factory().Blind("Meridian Scepter", _hit, _shooter, 1, 0, true, true, true);
end(); end();
return; return;
} }