diff --git a/.idea/libraries/Maven__com_mineplex_spigot_1_8_8_1_9_SNAPSHOT.xml b/.idea/libraries/Maven__com_mineplex_spigot_1_8_8_1_9_SNAPSHOT.xml
index b03149c6..24f745b9 100644
--- a/.idea/libraries/Maven__com_mineplex_spigot_1_8_8_1_9_SNAPSHOT.xml
+++ b/.idea/libraries/Maven__com_mineplex_spigot_1_8_8_1_9_SNAPSHOT.xml
@@ -8,6 +8,7 @@
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
deleted file mode 100644
index d60deb07..00000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_20_1_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_21_0_1.xml
similarity index 63%
rename from .idea/libraries/Maven__org_jetbrains_annotations_20_1_0.xml
rename to .idea/libraries/Maven__org_jetbrains_annotations_21_0_1.xml
index de125e3a..335bdda2 100644
--- a/.idea/libraries/Maven__org_jetbrains_annotations_20_1_0.xml
+++ b/.idea/libraries/Maven__org_jetbrains_annotations_21_0_1.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/Mineplex.Cache/mineplex-cache.iml b/Mineplex.Cache/mineplex-cache.iml
index 37636e4a..fe5f1fb6 100644
--- a/Mineplex.Cache/mineplex-cache.iml
+++ b/Mineplex.Cache/mineplex-cache.iml
@@ -9,15 +9,6 @@
-
-
-
-
-
-
-
-
-
@@ -27,5 +18,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mineplex.Core/mineplex-core.iml b/Mineplex.Core/mineplex-core.iml
index 092ff29d..e0a264c7 100644
--- a/Mineplex.Core/mineplex-core.iml
+++ b/Mineplex.Core/mineplex-core.iml
@@ -46,7 +46,7 @@
-
+
\ No newline at end of file
diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class
index 78508112..3c4d3fe7 100644
Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class differ
diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class
index c73b5c17..24ada4b1 100644
Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class differ
diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class
index 41e80849..797fcd9a 100644
Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class differ
diff --git a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class
index c7eebc7f..f9704f58 100644
Binary files a/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class and b/Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class differ
diff --git a/Mineplex.Hub/mineplex-hub.iml b/Mineplex.Hub/mineplex-hub.iml
index d2939098..d5ccd7ea 100644
--- a/Mineplex.Hub/mineplex-hub.iml
+++ b/Mineplex.Hub/mineplex-hub.iml
@@ -40,7 +40,7 @@
-
+
diff --git a/Mineplex.Minecraft.Game.ClassCombat/mineplex-minecraft-game-classcombat.iml b/Mineplex.Minecraft.Game.ClassCombat/mineplex-minecraft-game-classcombat.iml
index c6e9a2ee..fee5e464 100644
--- a/Mineplex.Minecraft.Game.ClassCombat/mineplex-minecraft-game-classcombat.iml
+++ b/Mineplex.Minecraft.Game.ClassCombat/mineplex-minecraft-game-classcombat.iml
@@ -41,7 +41,7 @@
-
+
diff --git a/Mineplex.Minecraft.Game.Core/mineplex-minecraft-game-core.iml b/Mineplex.Minecraft.Game.Core/mineplex-minecraft-game-core.iml
index d9fdc814..0c72fc17 100644
--- a/Mineplex.Minecraft.Game.Core/mineplex-minecraft-game-core.iml
+++ b/Mineplex.Minecraft.Game.Core/mineplex-minecraft-game-core.iml
@@ -40,7 +40,7 @@
-
+
diff --git a/Mineplex.ServerData/mineplex-serverdata.iml b/Mineplex.ServerData/mineplex-serverdata.iml
index 78e298af..547a5cad 100644
--- a/Mineplex.ServerData/mineplex-serverdata.iml
+++ b/Mineplex.ServerData/mineplex-serverdata.iml
@@ -9,14 +9,6 @@
-
-
-
-
-
-
-
-
@@ -26,5 +18,14 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Mineplex.StaffServer/mineplex-staffserver.iml b/Mineplex.StaffServer/mineplex-staffserver.iml
index 893a8d89..1fe7c687 100644
--- a/Mineplex.StaffServer/mineplex-staffserver.iml
+++ b/Mineplex.StaffServer/mineplex-staffserver.iml
@@ -38,7 +38,7 @@
-
+
diff --git a/Nautilus.Game.Arcade/nautilus-game-arcade.iml b/Nautilus.Game.Arcade/nautilus-game-arcade.iml
index abe04c5e..49232896 100644
--- a/Nautilus.Game.Arcade/nautilus-game-arcade.iml
+++ b/Nautilus.Game.Arcade/nautilus-game-arcade.iml
@@ -40,7 +40,7 @@
-
+
diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
index b835e09b..a8810db2 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
@@ -1006,7 +1006,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
}
}
- //Added random comment to test that the gitignore is properly set-up Take 3
boolean nullGame = _game == null;
GameDisplay game = null;
diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
index 192ca582..8b69dc5d 100644
--- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
+++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
@@ -263,7 +263,7 @@ public abstract class LobbyManager implements Listener
return;
}
- _advertiseStage = (_advertiseStage + 1) % 7;
+ _advertiseStage = (_advertiseStage + 1) % 8;
if (_manager.GetGame().AdvertiseText(this, _advertiseStage))
{
@@ -274,7 +274,7 @@ public abstract class LobbyManager implements Listener
{
writeAdvertiseLine("#REVIVECS", 0, 159, (byte) 4);
writeAdvertiseLine("AND DUTTY CAN'T", 1, 159, (byte) 15);
- writeAdvertiseLine("STOP US!", 2, 159, (byte) 15);
+ writeAdvertiseLine("STOP US!", 2, 159, (byte) 4);
writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
}
@@ -324,6 +324,14 @@ public abstract class LobbyManager implements Listener
writeAdvertiseLine("SAY \"FINE, WE'LL", 1, 159, (byte) 15);
writeAdvertiseLine("DO IT OURSELVES\"", 2, 159, (byte) 4);
+ writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
+ }
+ else if (_advertiseStage == 7)
+ {
+ writeAdvertiseLine("#REVIVECS", 0, 159, (byte) 4);
+ writeAdvertiseLine("#CSBEST", 1, 159, (byte) 15);
+ writeAdvertiseLine("#CSGIRULEZ", 2, 159, (byte) 4);
+
writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
}
}
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/ArcadeManager.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/ArcadeManager.class
index f93a5d77..a830ce1d 100644
Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/ArcadeManager.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/ArcadeManager.class differ
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeKing.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeKing.class
index a68b23f0..30e6fa96 100644
Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeKing.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeKing.class differ
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadZombie2.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadZombie2.class
new file mode 100644
index 00000000..0e4ca958
Binary files /dev/null and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadZombie2.class differ
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/christmasnew/section/one/Section1$1.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/christmasnew/section/one/Section1$1.class
index 58e8cb7e..f6b307eb 100644
Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/christmasnew/section/one/Section1$1.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/christmasnew/section/one/Section1$1.class differ
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/team/TeamRequestsModule$1.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/team/TeamRequestsModule$1.class
index 298d8861..4ba8d766 100644
Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/team/TeamRequestsModule$1.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/team/TeamRequestsModule$1.class differ
diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/lobby/LobbyManager.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/lobby/LobbyManager.class
index fdc9347b..55c30a66 100644
Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/lobby/LobbyManager.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/lobby/LobbyManager.class differ
diff --git a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar
index 9b910050..8f9fb537 100644
Binary files a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar and b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar differ