diff --git a/Maps/Cake Wars Standard/CakeWars4_Campgrounds.zip b/Community Parsed Maps/Cake Wars Standard/CakeWars4_Campgrounds.zip similarity index 100% rename from Maps/Cake Wars Standard/CakeWars4_Campgrounds.zip rename to Community Parsed Maps/Cake Wars Standard/CakeWars4_Campgrounds.zip diff --git a/Maps/Micro Battle/Micro_Castles.zip b/Community Parsed Maps/Micro Battle/Micro_Castles.zip similarity index 100% rename from Maps/Micro Battle/Micro_Castles.zip rename to Community Parsed Maps/Micro Battle/Micro_Castles.zip diff --git a/Maps/Micro Battle/Micro_Deserted.zip b/Community Parsed Maps/Micro Battle/Micro_Deserted.zip similarity index 100% rename from Maps/Micro Battle/Micro_Deserted.zip rename to Community Parsed Maps/Micro Battle/Micro_Deserted.zip diff --git a/Maps/Micro Battle/Micro_Itty_Bitty_City.zip b/Community Parsed Maps/Micro Battle/Micro_Itty_Bitty_City.zip similarity index 100% rename from Maps/Micro Battle/Micro_Itty_Bitty_City.zip rename to Community Parsed Maps/Micro Battle/Micro_Itty_Bitty_City.zip diff --git a/Maps/Micro Battle/Micro_Land_of_Time.zip b/Community Parsed Maps/Micro Battle/Micro_Land_of_Time.zip similarity index 100% rename from Maps/Micro Battle/Micro_Land_of_Time.zip rename to Community Parsed Maps/Micro Battle/Micro_Land_of_Time.zip diff --git a/Maps/Micro Battle/Micro_Lost Atlantis.zip b/Community Parsed Maps/Micro Battle/Micro_Lost Atlantis.zip similarity index 100% rename from Maps/Micro Battle/Micro_Lost Atlantis.zip rename to Community Parsed Maps/Micro Battle/Micro_Lost Atlantis.zip diff --git a/Maps/Micro Battle/Micro_Lumber Land.zip b/Community Parsed Maps/Micro Battle/Micro_Lumber Land.zip similarity index 100% rename from Maps/Micro Battle/Micro_Lumber Land.zip rename to Community Parsed Maps/Micro Battle/Micro_Lumber Land.zip diff --git a/Maps/Micro Battle/Micro_Mars Is Flat.zip b/Community Parsed Maps/Micro Battle/Micro_Mars Is Flat.zip similarity index 100% rename from Maps/Micro Battle/Micro_Mars Is Flat.zip rename to Community Parsed Maps/Micro Battle/Micro_Mars Is Flat.zip diff --git a/Maps/Micro Battle/Micro_Seasons.zip b/Community Parsed Maps/Micro Battle/Micro_Seasons.zip similarity index 100% rename from Maps/Micro Battle/Micro_Seasons.zip rename to Community Parsed Maps/Micro Battle/Micro_Seasons.zip diff --git a/Maps/Micro Battle/Micro_Towers_9998.zip b/Community Parsed Maps/Micro Battle/Micro_Towers_9998.zip similarity index 100% rename from Maps/Micro Battle/Micro_Towers_9998.zip rename to Community Parsed Maps/Micro Battle/Micro_Towers_9998.zip diff --git a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java index 8a59bcac..e903062a 100644 --- a/Plugins[Modified]/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java +++ b/Plugins[Modified]/Mineplex.Core/src/mineplex/core/profileCache/ProfileCacheManager.java @@ -81,7 +81,6 @@ public class ProfileCacheManager extends MiniPlugin implements GameProfileReposi gameProfile.getProperties().putAll(propertyMap); return gameProfile; } - return null; } diff --git a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/BungeeServer.java b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/BungeeServer.java index 669e6e5f..65e639a4 100644 --- a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/BungeeServer.java +++ b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/BungeeServer.java @@ -1,7 +1,6 @@ package mineplex.serverdata.data; import mineplex.serverdata.Region; -import mineplex.serverdata.data.Data; public class BungeeServer implements Data { diff --git a/Plugins[Modified]/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java b/Plugins[Modified]/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java index 7650caac..a6159a77 100644 --- a/Plugins[Modified]/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java +++ b/Plugins[Modified]/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java @@ -564,9 +564,8 @@ public class ServerMonitor if (serversToRestart <= 5) serversToRestart = 0; } - - } + else if (serverGroup.getName().equalsIgnoreCase("Halloween")) { if (serverGroup.getServers().size() > (_region == Region.US ? 300 : 100)) @@ -581,6 +580,7 @@ public class ServerMonitor serversToAdd = 0; } } + else if (serverGroup.getName().equalsIgnoreCase("UltraHardcore")) { int maxUHC = Math.max(1, _totalPlayers / 6000); diff --git a/Plugins[Modified]/pom.xml b/Plugins[Modified]/pom.xml index f1f69dfd..dc37ad9d 100644 --- a/Plugins[Modified]/pom.xml +++ b/Plugins[Modified]/pom.xml @@ -29,6 +29,7 @@ Mineplex.Game.Nano Mineplex.Hub Nautilus.Game.Arcade + Mineplex.Bungee.Mineplexer diff --git a/README.md b/README.md index da103691..08ef2c8b 100644 --- a/README.md +++ b/README.md @@ -10,15 +10,6 @@ Mineplex source code dated back to 2018 5. [Redis](https://github.com/tporadowski/redis/releases) & [Redis Desktop Manager](https://anonfiles.com/399650s1ze/RedisManager_zip) 6. [Mineplex's Backend Server](https://github.com/timing1337/MineplexMonitor) -## Working status -- ✅ Arcade -- ✅ Hub -- ❓ NanoGames -- ❓ Networking/Bungee related -- ❓ Clans -- ❓ StaffServer -- ❓ GemsHunter - ## Building ``mvn package`` @@ -38,4 +29,8 @@ Needs any helps? Contact my discord and i'll try to help you as much as I can - [] Redis scripts for easier setup(?) - [] Custom game maps +## Map parsing credits +- GalaxiaOwner / Micro Battles +- TheBlueKingLP / Champion CTF + Dear Mineplex, if you have any issues with this repo, please contact me immediently. \ No newline at end of file