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

cannon correctly loadded title + fixed rotation being all wrong

This commit is contained in:
NewGarbo 2016-01-26 17:51:29 +00:00
parent 7c85fe62ca
commit 63f9622876
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java
View File

@ -46,6 +46,8 @@ import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilText;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilTime;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.updater.UpdateType;
@ -206,10 +208,17 @@ public class Cannon implements Listener
return;
}
if (canBeFired())
{
ClansManager.getInstance().runSyncLater(() -> {
if (event.getPlayer().getInventory().equals(_inventory))
{
return;
}
}
if (canBeFired())
{
UtilTextMiddle.display("Cannon Ready", "Power Level: " + C.cGreen + UtilText.repeat("▌", getPower()) + C.cRed + UtilText.repeat("▌", 3 - getPower()), 20, 100, 20, _rider);
}
}, 3L);
}
@EventHandler(priority = EventPriority.HIGHEST)
@ -512,8 +521,8 @@ public class Cannon implements Listener
}
ArmorStand armorStand = (ArmorStand) UtilMath.getFirst(_entities);
double standYaw = Math.abs(Math.toDegrees(armorStand.getHeadPose().getY()) % 360);
double riderYaw = Math.abs(_rider.getLocation().getYaw() % 360);
double standYaw = Math.toDegrees(armorStand.getHeadPose().getY()) % 360;
double riderYaw = _rider.getLocation().getYaw() % 360;
double dif = riderYaw - standYaw;