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

Fixing some spelling typos chat filtering and the scoreboard.

Browse Source
This commit is contained in:
Sarah 2015-10-20 19:23:58 +02:00
parent b7b99687c8
commit 6860f013d0
6 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
View File

@ -747,9 +747,9 @@ public enum Achievement
new int[]{1}, new int[]{1},
AchievementCategory.TYPE_WARS), AchievementCategory.TYPE_WARS),
TYPE_WARS_WINNS("The true Typewriter", 2000, TYPE_WARS_WINNS("The True Typewriter", 2000,
new String[]{"Type Wars.Wins"}, new String[]{"Type Wars.Wins"},
new String[]{"winn 30 Games"}, new String[]{"Win 30 Games"},
new int[]{30}, new int[]{30},
AchievementCategory.TYPE_WARS); AchievementCategory.TYPE_WARS);

15
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/Cards.java
View File

@ -2,17 +2,9 @@ package nautilus.game.arcade.game.games.cards;
import java.util.ArrayList; import java.util.ArrayList;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
@ -23,6 +15,13 @@ import nautilus.game.arcade.game.games.GameScore;
import nautilus.game.arcade.game.games.cards.kits.KitPlayer; import nautilus.game.arcade.game.games.cards.kits.KitPlayer;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.ItemFrame;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.inventory.ItemStack;
public class Cards extends SoloGame public class Cards extends SoloGame
{ {
private CardFactory _cardFactory; private CardFactory _cardFactory;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/Minion.java
View File

@ -153,8 +153,7 @@ public class Minion implements Listener
"Fly", "Boy", "Rag", "New", "Jet", "Pet", "Tin", "Pen", "Car", "Fly", "Boy", "Rag", "New", "Jet", "Pet", "Tin", "Pen", "Car",
"Old", "Age", "TNT", "Leg", "Axe", "UFO", "Rap", "Wet", "Tie", "Old", "Age", "TNT", "Leg", "Axe", "UFO", "Rap", "Wet", "Tie",
"May", "Gas", "Hue", "Wax", "Toy", "Lay", "Pop", "Dry", "Sea", "May", "Gas", "Hue", "Wax", "Toy", "Lay", "Pop", "Dry", "Sea",
"See", "Ash", "Mom", "Box", "Key", "Fat", "Spy", "See", "Ash", "Mom", "Box", "Key", "Fat", "Spy"};
"why +3?"};
private ArcadeManager _manager; private ArcadeManager _manager;

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
View File

@ -336,6 +336,9 @@ public class TypeWars extends TeamGame
@EventHandler @EventHandler
public void chatCheck(AsyncPlayerChatEvent event) public void chatCheck(AsyncPlayerChatEvent event)
{ {
if(!IsLive())
return;
if(!GetPlayers(true).contains(event.getPlayer())) if(!GetPlayers(true).contains(event.getPlayer()))
return; return;
@ -623,6 +626,9 @@ public class TypeWars extends TeamGame
if (GetTeamList().isEmpty()) if (GetTeamList().isEmpty())
return; return;
if(!IsLive())
return;
Scoreboard.Reset(); Scoreboard.Reset();
Scoreboard.WriteBlank(); Scoreboard.WriteBlank();
@ -635,7 +641,7 @@ public class TypeWars extends TeamGame
continue; continue;
Scoreboard.Write(team.GetColor() + C.Bold + team.GetName() + " Team"); Scoreboard.Write(team.GetColor() + C.Bold + team.GetName() + " Team");
Scoreboard.Write(team.GetColor() + "Lives: " + ((60 - getScore(teams)) > 0 ? 0 : (60 - getScore(teams)))); Scoreboard.Write(team.GetColor() + "Lives: " + (60 - getScore(teams)));
Scoreboard.Write(team.GetColor() + "Minions: " + getMinions(team).size() + "/60"); Scoreboard.Write(team.GetColor() + "Minions: " + getMinions(team).size() + "/60");
Scoreboard.WriteBlank(); Scoreboard.WriteBlank();
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/kits/KitTactician.java
View File

@ -25,7 +25,7 @@ public class KitTactician extends KitTypeWarsBase
}, },
new Perk[] new Perk[]
{ {
new Perk("Growth Line", new String[]{"creates a line that grows your minions names"}){}, new Perk("Growth Line", new String[]{"Creates a line that grows your minions names"}){},
new Perk("Mass Slow", new String[]{"Slows down all enemy Minions"}){}, new Perk("Mass Slow", new String[]{"Slows down all enemy Minions"}){},
new Perk("Nuke Spell", new String[]{"Kill all enemy minions. One use."}){} new Perk("Nuke Spell", new String[]{"Kill all enemy minions. One use."}){}
}, },

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/kits/KitWarrior.java
View File

@ -25,7 +25,7 @@ public class KitWarrior extends KitTypeWarsBase
}, },
new Perk[] new Perk[]
{ {
new Perk("Shrinking Line", new String[]{"creates a line that shortens enemy names"}){}, new Perk("Shrinking Line", new String[]{"Creates a line that shortens enemy names"}){},
new Perk("Sniper spell", new String[]{"Shoot a minion and kill it"}){}, new Perk("Sniper spell", new String[]{"Shoot a minion and kill it"}){},
new Perk("Nuke Spell", new String[]{"Kill all enemy minions. One use."}){} new Perk("Nuke Spell", new String[]{"Kill all enemy minions. One use."}){}
}, },