Merge branch 'EventGameUpdates'
Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
This commit is contained in:
commit
52844d7b80
|
@ -1,5 +1,6 @@
|
||||||
package nautilus.game.arcade;
|
package nautilus.game.arcade;
|
||||||
|
|
||||||
|
import java.awt.Event;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
@ -110,6 +111,7 @@ import nautilus.game.arcade.game.Game;
|
||||||
import nautilus.game.arcade.game.Game.GameState;
|
import nautilus.game.arcade.game.Game.GameState;
|
||||||
import nautilus.game.arcade.game.GameServerConfig;
|
import nautilus.game.arcade.game.GameServerConfig;
|
||||||
import nautilus.game.arcade.game.GameTeam;
|
import nautilus.game.arcade.game.GameTeam;
|
||||||
|
import nautilus.game.arcade.game.games.event.EventModule;
|
||||||
import nautilus.game.arcade.game.games.uhc.UHC;
|
import nautilus.game.arcade.game.games.uhc.UHC;
|
||||||
import nautilus.game.arcade.managers.GameAchievementManager;
|
import nautilus.game.arcade.managers.GameAchievementManager;
|
||||||
import nautilus.game.arcade.managers.GameChatManager;
|
import nautilus.game.arcade.managers.GameChatManager;
|
||||||
|
@ -143,6 +145,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
private Creature _creature;
|
private Creature _creature;
|
||||||
private DamageManager _damageManager;
|
private DamageManager _damageManager;
|
||||||
private Explosion _explosionManager;
|
private Explosion _explosionManager;
|
||||||
|
private EventModule _eventManager;
|
||||||
|
|
||||||
private Fire _fire;
|
private Fire _fire;
|
||||||
private ProjectileManager _projectileManager;
|
private ProjectileManager _projectileManager;
|
||||||
|
@ -257,6 +260,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
_cosmeticManager = cosmeticManager;
|
_cosmeticManager = cosmeticManager;
|
||||||
_portal = portal;
|
_portal = portal;
|
||||||
_petManager = petManager;
|
_petManager = petManager;
|
||||||
|
_eventManager = new EventModule(this, getPlugin());
|
||||||
|
|
||||||
// Shop
|
// Shop
|
||||||
_arcadeShop = new ArcadeShop(this, clientManager, donationManager);
|
_arcadeShop = new ArcadeShop(this, clientManager, donationManager);
|
||||||
|
@ -562,6 +566,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
return _gameWorldManager;
|
return _gameWorldManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public EventModule GetEventModule()
|
||||||
|
{
|
||||||
|
return _eventManager;
|
||||||
|
}
|
||||||
|
|
||||||
public PreferencesManager getPreferences()
|
public PreferencesManager getPreferences()
|
||||||
{
|
{
|
||||||
return _preferencesManager;
|
return _preferencesManager;
|
||||||
|
@ -818,6 +827,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, C.Bold + "Server has reached max capacity for gameplay purposes.");
|
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, C.Bold + "Server has reached max capacity for gameplay purposes.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else if (_gameHostManager.isEventServer() && Bukkit.getServer().getOnlinePlayers().size() >= 128)
|
||||||
|
{
|
||||||
|
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, C.Bold + "Server has reached max capacity for gameplay purposes.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
event.allow();
|
event.allow();
|
||||||
event.setResult(PlayerLoginEvent.Result.ALLOWED);
|
event.setResult(PlayerLoginEvent.Result.ALLOWED);
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -77,7 +77,7 @@ public class GameChatManager implements Listener
|
||||||
}
|
}
|
||||||
else if (Manager.GetGameHostManager().isAdmin(event.getPlayer(), false))
|
else if (Manager.GetGameHostManager().isAdmin(event.getPlayer(), false))
|
||||||
{
|
{
|
||||||
if (Manager.GetGame() != null && Manager.GetGame().GetType() == GameType.Event)
|
if (Manager.GetGameHostManager().isEventServer())
|
||||||
rankStr = C.cDGreen + C.Bold + "Event Admin ";
|
rankStr = C.cDGreen + C.Bold + "Event Admin ";
|
||||||
else
|
else
|
||||||
rankStr = C.cDGreen + C.Bold + "MPS Admin ";
|
rankStr = C.cDGreen + C.Bold + "MPS Admin ";
|
||||||
|
|
|
@ -391,7 +391,7 @@ public class GameHostManager implements Listener
|
||||||
}
|
}
|
||||||
msg = msg.trim();
|
msg = msg.trim();
|
||||||
|
|
||||||
Bukkit.broadcastMessage("§6§l" + event.getPlayer().getName() + " §e" + msg);
|
Bukkit.broadcastMessage("§6§l" + event.getPlayer().getName() + " §e" + msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
|
|
Loading…
Reference in New Issue