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

- Spawn regen

Browse Source
This commit is contained in:
AlexTheCoder 2016-02-17 22:12:23 -05:00
parent fe849576f7
commit d3884bd090
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/MinecraftLeague.java
View File

@ -12,7 +12,6 @@ import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilItem;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilTime;
@ -26,6 +25,7 @@ import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.events.PlayerGameRespawnEvent;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.game.TeamGame;
@ -83,6 +83,8 @@ import org.bukkit.event.player.PlayerPickupItemEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import com.google.common.base.Objects;
@ -856,7 +858,7 @@ public class MinecraftLeague extends TeamGame
}
}
/*@EventHandler
@EventHandler
public void onRespawn(PlayerGameRespawnEvent event)
{
if (event.GetGame() != this)
@ -864,7 +866,9 @@ public class MinecraftLeague extends TeamGame
Player player = event.GetPlayer();
if (!_crystals.get(GetTeam(player)).Alive)
player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 5 * 20, 3));
/*if (!_crystals.get(GetTeam(player)).Alive)
{
SetPlayerState(player, PlayerState.OUT);
@ -891,8 +895,8 @@ public class MinecraftLeague extends TeamGame
}
if (_overTime)
_crystals.get(GetTeam(player)).damage(20, null);
}*/
_crystals.get(GetTeam(player)).damage(20, null);*/
}
@EventHandler
public void onDrop(PlayerDropItemEvent event)