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

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master

This commit is contained in:
Jonathan Williams 2013-09-03 23:31:44 -07:00
parent d5ef0208a1 93e59c1c43
commit 2a2c48087f
9 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -277,6 +277,9 @@ public abstract class Game implements Listener
_gameState = state;
_gameStateTime = System.currentTimeMillis();
for (Player player : UtilServer.getPlayers())
player.leaveVehicle();
//Event
GameStateChangeEvent stateEvent = new GameStateChangeEvent(this, state);
UtilServer.getServer().getPluginManager().callEvent(stateEvent);

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitGolem.java
View File

@ -30,8 +30,8 @@ public class KitGolem extends SmashKit
new PerkSmashStats(7, 1.0, 0.25, 8),
new PerkDoubleJump("Double Jump", 0.9, 0.9, false),
new PerkSlow(0),
new PerkSeismicSlam(),
new PerkFissure(),
new PerkSeismicSlam(),
},
EntityType.IRON_GOLEM,
@ -41,7 +41,7 @@ public class KitGolem extends SmashKit
@Override
public void GiveItems(Player player)
{
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1,
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD, (byte)0, 1,
C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Fissure",
new String[]
{
@ -53,7 +53,7 @@ public class KitGolem extends SmashKit
}));
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_SPADE, (byte)0, 1,
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.IRON_AXE, (byte)0, 1,
C.cYellow + C.Bold + "Right-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Seismic Slam",
new String[]
{

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitKnight.java
View File

@ -25,6 +25,7 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.disguise.disguises.DisguiseSkeleton;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@ -89,6 +90,12 @@ public class KitKnight extends SmashKit
player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(Material.IRON_BOOTS));
//Disguise
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(C.cYellow + player.getName());
disguise.SetCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
//Horse
Manager.GetGame().CreatureAllowOverride = true;
final Horse horse = player.getWorld().spawn(player.getLocation(), Horse.class);
Manager.GetGame().CreatureAllowOverride = false;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/smash/kits/KitSkeleton.java
View File

@ -38,7 +38,7 @@ public class KitSkeleton extends SmashKit
new PerkFletcher(1, 2, false),
new PerkKnockbackArrow(2),
new PerkBoneExplosion(),
new PerkRopedArrow("Roped Arrow", 1, 2500),
new PerkRopedArrow("Roped Arrow", 1, 2000),
new PerkBarrage(5, 250, true),
},
EntityType.SKELETON,

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkFissure.java
View File

@ -45,7 +45,7 @@ public class PerkFissure extends Perk
if (event.getPlayer().getItemInHand() == null)
return;
if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE"))
if (!event.getPlayer().getItemInHand().getType().toString().contains("_SPADE"))
return;
Player player = event.getPlayer();

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkNeedler.java
View File

@ -56,7 +56,7 @@ public class PerkNeedler extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 2000, true))
if (!Recharge.Instance.use(player, GetName(), 1800, true))
return;
_active.put(player, 7);

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkRopedArrow.java
View File

@ -70,14 +70,6 @@ public class PerkRopedArrow extends Perk
arrow.setVelocity(player.getLocation().getDirection().multiply(2.4 * _power));
_arrows.add(arrow);
//Leash
//Bat bat = player.getWorld().spawn(player.getEyeLocation(), Bat.class);
//bat.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 100000, 100000));
//bat.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, 100000, 100000));
//bat.setLeashHolder(arrow);
//Inform
UtilPlayer.message(player, F.main("Game", "You fired " + F.skill(_name) + "."));
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java
View File

@ -54,7 +54,7 @@ public class PerkSeismicSlam extends Perk
if (event.getPlayer().getItemInHand() == null)
return;
if (!event.getPlayer().getItemInHand().getType().toString().contains("_SPADE"))
if (!event.getPlayer().getItemInHand().getType().toString().contains("_AXE"))
return;
Player player = event.getPlayer();