From 9da4abf235cdc2f23ea2633769e9a4f58a879449 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Thu, 14 Jun 2018 02:33:50 -0400 Subject: [PATCH] Bypass Enjin servers for resource pack downloads --- .../resourcepack/ResourcePackManager.java | 9 ++--- .../src/mineplex/game/clans/Clans.java | 6 ++-- .../src/nautilus/game/arcade/GameType.java | 36 ++++++++++++------- .../game/games/minestrike/GunModule.java | 3 +- 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java index 8afb55087..c8c395b96 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java @@ -219,7 +219,8 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback for (Player player : Bukkit.getOnlinePlayers()) { - player.setResourcePack("http://file.mineplex.com/ResReset.zip"); + //player.setResourcePack("http://file.mineplex.com/ResReset.zip"); + player.setResourcePack("http://198.20.72.74/ResReset.zip"); } } else @@ -257,8 +258,8 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback return; } - player.setResourcePack("http://file.mineplex.com/ResReset.zip"); + //player.setResourcePack("http://file.mineplex.com/ResReset.zip"); + player.setResourcePack("http://198.20.72.74/ResReset.zip"); } } - -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index e3b2f7b92..e5c526faf 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -171,8 +171,10 @@ public class Clans extends JavaPlugin ResourcePackManager resourcePackManager = new ResourcePackManager(this, portal); resourcePackManager.setResourcePack(new Pair[] { - Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResClans.zip"), - Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResClans19.zip") + //Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResClans.zip"), + //Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResClans19.zip") + Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResClans.zip"), + Pair.create(MinecraftVersion.Version1_9, "http://198.20.72.74/ResClans19.zip") }, true); SnapshotManager snapshotManager = new SnapshotManager(this, new SnapshotRepository(serverStatusManager.getCurrentServerName(), getLogger())); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java index a11e6d317..08479b510 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java @@ -124,12 +124,15 @@ public enum GameType ChampionsTDM(ChampionsTDM.class, GameDisplay.ChampionsTDM), Christmas(Christmas.class, GameDisplay.Christmas, new Pair[] { - Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResChristmas.zip") + //Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResChristmas.zip") + Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResChristmas.zip") }, true), ChristmasNew(ChristmasNew.class, GameDisplay.ChristmasNew, new Pair[] { - Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResChristmas2.zip"), - Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResChristmas219.zip") + //Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResChristmas2.zip"), + //Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResChristmas219.zip") + Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResChristmas2.zip"), + Pair.create(MinecraftVersion.Version1_9, "http://198.20.72.74/ResChristmas219.zip") }, false), DeathTag(DeathTag.class, GameDisplay.DeathTag), DragonEscape(DragonEscape.class, GameDisplay.DragonEscape), @@ -137,14 +140,16 @@ public enum GameType DragonsTeams(DragonsTeams.class, GameDisplay.DragonsTeams), Draw(Draw.class, GameDisplay.Draw, new Pair[] { - Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResDrawMyThing.zip") + //Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResDrawMyThing.zip") + Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResDrawMyThing.zip") }, true), ElytraRings(ElytraRings.class, GameDisplay.ElytraRings), Evolution(Evolution.class, GameDisplay.Evolution), Gravity(Gravity.class, GameDisplay.Gravity), Halloween(Halloween.class, GameDisplay.Halloween, new Pair[] { - Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResHalloween.zip") + //Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResHalloween.zip") + Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResHalloween.zip") }, true), Halloween2016(Halloween2016.class, GameDisplay.Halloween2016), HideSeek(HideSeek.class, GameDisplay.HideSeek), @@ -153,8 +158,10 @@ public enum GameType MilkCow(MilkCow.class, GameDisplay.MilkCow), MineStrike(Minestrike.class, GameDisplay.MineStrike, new Pair[] { - Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResMinestrike.zip"), - Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResMinestrike19.zip") + //Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResMinestrike.zip"), + //Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResMinestrike19.zip") + Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResMinestrike.zip"), + Pair.create(MinecraftVersion.Version1_9, "http://198.20.72.74/ResMinestrike19.zip") }, true), BawkBawkBattles(BawkBawkBattles.class, GameDisplay.BawkBawkBattles), MinecraftLeague(MinecraftLeague.class, GameDisplay.Minecraft_League), @@ -186,7 +193,8 @@ public enum GameType WitherAssault(WitherGame.class, GameDisplay.WitherAssault), Wizards(Wizards.class, GameDisplay.Wizards, new Pair[] { - Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResWizards.zip") + //Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResWizards.zip") + Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResWizards.zip") }, true), ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival), Build(Build.class, GameDisplay.Build), @@ -207,8 +215,10 @@ public enum GameType BattleRoyale(BattleRoyaleSolo.class, GameDisplay.BattleRoyale, new Pair[] { - Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResStrikeGames18.zip"), - Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResStrikeGames19.zip") + //Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResStrikeGames18.zip"), + //Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResStrikeGames19.zip") + Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResStrikeGames18.zip"), + Pair.create(MinecraftVersion.Version1_9, "http://198.20.72.74/ResStrikeGames19.zip") }, true), CakeWars4(CakeWars.class, GameDisplay.CakeWars4), @@ -254,8 +264,10 @@ public enum GameType new GameMode(SmashDom.class, GameType.ChampionsDominate, "Smash Dominate"), new GameMode(SuperPaintstrike.class, GameType.MineStrike, "Super Paintstrike", new Pair[] { - Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResMinestrike.zip"), - Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResMinestrike19.zip") + //Pair.create(MinecraftVersion.Version1_8, "http://file.mineplex.com/ResMinestrike.zip"), + //Pair.create(MinecraftVersion.Version1_9, "http://file.mineplex.com/ResMinestrike19.zip") + Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResMinestrike.zip"), + Pair.create(MinecraftVersion.Version1_9, "http://198.20.72.74/ResMinestrike19.zip") }, true), }, GameDisplay.Brawl, null, false, null, false, true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java index df680e600..e6740713d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java @@ -1908,7 +1908,8 @@ public class GunModule implements Listener { if (event.getMessage().equalsIgnoreCase("/rpoff")) { - event.getPlayer().setResourcePack("http://file.mineplex.com/ResReset.zip"); + //event.getPlayer().setResourcePack("http://file.mineplex.com/ResReset.zip"); + event.getPlayer().setResourcePack("http://198.20.72.74/ResReset.zip"); UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Resource Pack: " + C.cRed + "Disabled")); UtilPlayer.message(event.getPlayer(), F.main("Resource Pack", "Type " + F.elem("/rpon") + " to enable."));