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

Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm

This commit is contained in:
Sam 2017-05-07 22:36:44 +01:00
parent 2e3d19bd3a b0407cfc51
commit 24c81101a1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java
View File

@ -1,5 +1,13 @@
package mineplex.gemhunters; package mineplex.gemhunters;
import net.minecraft.server.v1_8_R3.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
import org.bukkit.plugin.java.JavaPlugin;
import org.spigotmc.SpigotConfig;
import mineplex.core.CustomTagFix; import mineplex.core.CustomTagFix;
import mineplex.core.FoodDupeFix; import mineplex.core.FoodDupeFix;
import mineplex.core.TimingsFix; import mineplex.core.TimingsFix;
@ -91,12 +99,6 @@ import mineplex.gemhunters.worldevent.WorldEventModule;
import mineplex.minecraft.game.core.combat.CombatManager; import mineplex.minecraft.game.core.combat.CombatManager;
import mineplex.minecraft.game.core.condition.ConditionManager; import mineplex.minecraft.game.core.condition.ConditionManager;
import mineplex.minecraft.game.core.damage.DamageManager; import mineplex.minecraft.game.core.damage.DamageManager;
import net.minecraft.server.v1_8_R3.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
import org.bukkit.plugin.java.JavaPlugin;
import org.spigotmc.SpigotConfig;
import static mineplex.core.Managers.require; import static mineplex.core.Managers.require;
@ -173,7 +175,7 @@ public class GemHunters extends JavaPlugin
Portal portal = new Portal(); Portal portal = new Portal();
// File Updater // File Updater
new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion(), GenericServer.BETA_HUB); new FileUpdater(this, portal, serverStatusManager.getCurrentServerName(), serverStatusManager.getRegion(), GenericServer.HUB);
// Punish // Punish
Punish punish = new Punish(this, clientManager); Punish punish = new Punish(this, clientManager);

2
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/spawn/command/HubCommand.java
View File

@ -20,7 +20,7 @@ public class HubCommand extends CommandBase<SpawnModule>
@Override @Override
public void Execute(Player caller, String[] args) public void Execute(Player caller, String[] args)
{ {
Portal.getInstance().sendPlayerToGenericServer(caller, GenericServer.BETA_HUB, Intent.PLAYER_REQUEST); Portal.getInstance().sendPlayerToGenericServer(caller, GenericServer.HUB, Intent.PLAYER_REQUEST);
} }
} }