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

Merge branch 'monster-maze' of

Browse Source 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
monster-maze

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
This commit is contained in:
Mysticate 2015-09-23 23:46:21 -04:00
commit 5de016c077
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java
View File

@ -37,6 +37,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.block.EntityBlockFormEvent;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.scoreboard.Team;
@ -70,6 +71,8 @@ public class MonsterMaze extends SoloGame
this.DamagePvP = false;
this.DamageFall = false;
this.HungerSet = 20;
this.PrepareFreeze = false;
this.HungerSet = 20;
@ -89,6 +92,14 @@ public class MonsterMaze extends SoloGame
return _maze;
}
@EventHandler
public void health(EntityRegainHealthEvent event)
{
if(!(event.getEntity() instanceof Player)) return;
event.setCancelled(true);
}
@EventHandler
public void Update(UpdateEvent event)
{
@ -243,7 +254,7 @@ public class MonsterMaze extends SoloGame
Scoreboard.WriteBlank();
Scoreboard.Write(C.cYellow + C.Bold + "Players");
if (GetPlayers(true).size() > 6)
{
Scoreboard.Write(C.cWhite + GetPlayers(true).size());