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

- Looks better

Browse Source
This commit is contained in:
AlexTheCoder 2016-04-21 01:03:14 -04:00
parent d57cc48f0f
commit df55d48ab8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minecraftleague/data/map/ItemMapManager.java
View File

@ -9,12 +9,10 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map.Entry;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilServer;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.portal.ServerTransferEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.game.games.minecraftleague.MinecraftLeague;
@ -447,7 +445,7 @@ public class ItemMapManager /*extends MiniPlugin*/ implements Listener
return _halfMapSize;
}
@EventHandler
/*@EventHandler
public void onServerTransfer(ServerTransferEvent event)
{
Player p = event.getPlayer();
@ -455,7 +453,7 @@ public class ItemMapManager /*extends MiniPlugin*/ implements Listener
p.sendMessage(C.cDRed + C.Bold + "WARNING!");
p.sendMessage(C.cYellow + "There's a bug where switching servers may freeze the Team Map!");
p.sendMessage(C.cYellow + "If you want to play Minecraft League again and this error occurs, rejoin the Mineplex server!");
}
}*/
private void rebuildScan()
{

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -36,6 +36,7 @@ import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.kit.perks.event.PerkDestructorBlockEvent;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.Sound;
@ -1293,7 +1294,12 @@ public class GameFlagManager implements Listener
continue;
}
long sec = UtilTime.convert(_respawnTimers.get(player) - System.currentTimeMillis(), TimeUnit.MILLISECONDS, TimeUnit.SECONDS);
UtilTextBottom.display("Respawning In: " + sec + " Seconds", player);
ChatColor color = ChatColor.RED;
if (sec < 8)
color = ChatColor.YELLOW;
if (sec < 4)
color = ChatColor.GREEN;
UtilTextBottom.display(color + "Respawning In: " + sec + " Seconds", player);
}
}
}