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

This commit is contained in:
Jonathan Williams 2013-11-23 00:57:54 -08:00
commit 7752d0e8a2

View File

@ -21,12 +21,14 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Snowball;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockBurnEvent;
import org.bukkit.event.block.BlockFadeEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.block.LeavesDecayEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@ -129,7 +131,7 @@ public class HungerGames extends SoloGame
});
Manager.GetAntiStack().SetEnabled(false);
this.WorldTimeSet = 0;
this.SpawnDistanceRequirement = 48;
@ -144,7 +146,7 @@ public class HungerGames extends SoloGame
this.ItemPickup = true;
this.CompassEnabled = false; //XXX
//Blocks
this.BlockBreakAllow.add(46); //TNT
this.BlockPlaceAllow.add(46);
@ -1182,4 +1184,10 @@ public class HungerGames extends SoloGame
{
event.SetDamageToLevel(false);
}
@EventHandler(priority = EventPriority.LOWEST)
public void ExplosionDamageRemove(EntityExplodeEvent event)
{
event.blockList().clear();
}
}