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

Grammar <3

Browse Source
This commit is contained in:
Mysticate 2015-09-30 19:45:29 -04:00
parent 68c6ba595e
commit 09ef2d73ae
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/KitRepulsor.java
View File

@ -22,9 +22,8 @@ public class KitRepulsor extends Kit
new String[] new String[]
{ {
"You were mean to all the", "You love to watch monsters",
"monsters, so now they all", "fly away... Caw..."
"run away from you! Rude!"
}, },
new Perk[] new Perk[]
@ -38,7 +37,7 @@ public class KitRepulsor extends Kit
@Override @Override
public void GiveItems(Player player) public void GiveItems(Player player)
{ {
player.getInventory().setItem(0, ItemStackFactory.Instance.CreateStack(Material.COAL, (byte) 0, 3, C.cYellow + C.Bold + "Right Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Smash")); player.getInventory().setItem(0, ItemStackFactory.Instance.CreateStack(Material.COAL, (byte) 0, 3, C.cYellow + C.Bold + "Right Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Repulse"));
player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.COMPASS, (byte) 0, 1, F.item("Safe Pad Locator"))); player.getInventory().setItem(4, ItemStackFactory.Instance.CreateStack(Material.COMPASS, (byte) 0, 1, F.item("Safe Pad Locator")));
} }
} }

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/kits/perks/PerkRepulsor.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilEvent;
import mineplex.core.common.util.UtilEvent.ActionType; import mineplex.core.common.util.UtilEvent.ActionType;
@ -96,7 +97,14 @@ public class PerkRepulsor extends Perk
continue; continue;
} }
if (en.isOnGround() && UtilTime.elapsed(copy.get(en), 250)) if (en.isOnGround() && UtilTime.elapsed(copy.get(en), 500))
{
remove(en);
continue;
}
//If there are blocks surrounding the block it's on top of (if it's on the side of a block)
if (!UtilBlock.getInBoundingBox(en.getLocation().clone().add(1, -1, 1), en.getLocation().clone().subtract(1, 1, 1), true).isEmpty() && UtilTime.elapsed(copy.get(en), 500))
{ {
remove(en); remove(en);
continue; continue;