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

Hub turns off flight (people were staying in flying somehow) 

Spleef block damage fix
Smash kit balances
This commit is contained in:
Chiss 2013-09-02 08:16:35 +10:00
parent 07dcfeb266
commit 9149cc565e
12 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -28,6 +28,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.block.LeavesDecayEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
@ -331,7 +332,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
continue;
if (UtilEnt.isGrounded(player) || UtilBlock.solid(player.getLocation().getBlock().getRelative(BlockFace.DOWN)))
{
player.setAllowFlight(true);
player.setFlying(false);
}
}
}
@ -583,4 +587,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
{
event.blockList().clear();
}
@EventHandler
public void VineGrow(BlockSpreadEvent event)
{
event.setCancelled(true);
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/spleef/Spleef.java
View File

@ -111,6 +111,8 @@ public class Spleef extends SoloGame
return;
event.setCancelled(true);
BlockFade(event.getBlock(), event.getPlayer());
}
@EventHandler

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

@ -42,11 +42,11 @@ public class SuperSmash extends SoloGame
new KitSkeleton(manager),
new KitEnderman(manager),
new KitBlaze(manager),
new KitChicken(manager),
new KitGolem(manager),
new KitSnowman(manager),
//new KitSpider(manager),
new KitSlime(manager),
new KitChicken(manager),
},
new String[]

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

@ -38,7 +38,7 @@ public class KitBlaze extends SmashKit
new PerkDamageSet(7),
new PerkKnockbackMultiplier(1.50),
new PerkKnockbackFire(1.50),
new PerkSpeed(1),
new PerkSpeed(0),
new PerkInferno(),
new PerkFirefly(12000)
},

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

@ -21,7 +21,7 @@ public class KitChicken extends SmashKit
{
public KitChicken(ArcadeManager manager)
{
super(manager, "Chicken", KitAvailability.Free,
super(manager, "Chicken", KitAvailability.Blue,
new String[]
{

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, 4000),
new PerkRopedArrow("Roped Arrow", 1, 3000),
//new PerkBarrage(5, 250, true),
},
EntityType.SKELETON,

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

@ -166,7 +166,7 @@ public class PerkChickenRocket extends Perk
//Damage Event
Manager.GetDamage().NewDamageEvent(livingEnt, data.Player, null,
DamageCause.PROJECTILE, 10, false, true, false,
DamageCause.PROJECTILE, 8, false, true, false,
data.Player.getName(), GetName());
UtilAction.velocity(livingEnt, UtilAlg.getTrajectory2d(data.Chicken, livingEnt), 1.6, true, 0.8, 0, 10, true);

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

@ -57,7 +57,7 @@ public class PerkEggGun extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 1500, true))
if (!Recharge.Instance.use(player, GetName(), 2500, true))
return;
_active.put(player, System.currentTimeMillis());

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

@ -59,7 +59,7 @@ public class PerkFissure extends Perk
return;
}
if (!Recharge.Instance.use(player, GetName(), 1000, true))
if (!Recharge.Instance.use(player, GetName(), 8000, true))
return;
FissureData data = new FissureData(this, player, player.getLocation().getDirection(), player.getLocation().add(0, -0.5, 0));

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

@ -62,7 +62,7 @@ public class PerkSeismicSlam extends Perk
if (!Kit.HasKit(player))
return;
if (!Recharge.Instance.use(player, GetName(), 1000, true))
if (!Recharge.Instance.use(player, GetName(), 6000, true))
return;
//Action

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSlimeRocket.java
View File

@ -57,7 +57,7 @@ public class PerkSlimeRocket extends Perk implements IThrown
if (player.isBlocking())
return;
player.setExp((float) Math.min(0.999, player.getExp()+0.0035));
player.setExp((float) Math.min(0.999, player.getExp()+0.004));
}
}
@ -239,7 +239,7 @@ public class PerkSlimeRocket extends Perk implements IThrown
if (event.GetReason() == null || !event.GetReason().contains(GetName()))
return;
event.AddKnockback(GetName(), 1.5);
event.AddKnockback(GetName(), 2.5);
}
@Override

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

@ -112,7 +112,7 @@ public class PerkSlimeSlam extends Perk
//Damage Event
Manager.GetDamage().NewDamageEvent(damager, damagee, null,
DamageCause.CUSTOM, damage, true, true, false,
DamageCause.CUSTOM, damage/2d, true, true, false,
damager.getName(), GetName() + " Recoil");
//Damage Event