Pushed fixes

This commit is contained in:
Chiss 2013-11-23 09:55:48 +11:00
parent 6e1f88c14f
commit 189b22ab4c
2 changed files with 5 additions and 5 deletions

View File

@ -136,15 +136,13 @@ public class HungerGames extends SoloGame
this.DamageSelf = true; this.DamageSelf = true;
this.DamageTeamSelf = true; this.DamageTeamSelf = true;
this.DeathOut = false; //XXX //this.DeathOut = false; //XXX
this.DeathDropItems = true; this.DeathDropItems = true;
this.ItemDrop = true; this.ItemDrop = true;
this.ItemPickup = true; this.ItemPickup = true;
this.CompassEnabled = true; this.CompassEnabled = false; //XXX
this.GemMultiplier = 2;
//Blocks //Blocks
this.BlockBreakAllow.add(46); //TNT this.BlockBreakAllow.add(46); //TNT

View File

@ -18,6 +18,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.Perk;
@ -97,8 +98,9 @@ public class PerkTNTArrow extends Perk
//TNT //TNT
TNTPrimed tnt = player.getWorld().spawn(player.getEyeLocation().add(0, 2, 0), TNTPrimed.class); TNTPrimed tnt = player.getWorld().spawn(player.getEyeLocation().add(0, 2, 0), TNTPrimed.class);
((CraftTNTPrimed)tnt).getHandle().spectating = true; ((CraftTNTPrimed)tnt).getHandle().spectating = true;
UtilAction.velocity(tnt, player.getLocation().getDirection(), event.getProjectile().getVelocity().length(), false, 0, 0.1, 10, false);
event.getProjectile().setPassenger(tnt); event.getProjectile().remove();
_tntMap.put(tnt, player); _tntMap.put(tnt, player);
} }