parent
4a0558d5c8
commit
cb2dd508bd
|
@ -217,11 +217,12 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
public static final String GAME_CMD_MODE_FILE = "GAME_CMD_MODE.dat";
|
||||
private boolean _gameCommandMode;
|
||||
|
||||
public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig, CoreClientManager clientManager, DonationManager donationManager,
|
||||
DamageManager damageManager, StatsManager statsManager, IncognitoManager incognitoManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature,
|
||||
Teleport teleport, Blood blood, Chat chat, Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler, CosmeticManager cosmeticManager,
|
||||
ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress, PollManager pollManager, NpcManager npcManager,
|
||||
CustomDataManager customDataManager, Punish punish, EloManager eloManager)
|
||||
public ArcadeManager(Arcade plugin, ServerStatusManager serverStatusManager, GameServerConfig serverConfig,
|
||||
CoreClientManager clientManager, DonationManager donationManager, DamageManager damageManager,
|
||||
StatsManager statsManager, IncognitoManager incognitoManager, AchievementManager achievementManager, DisguiseManager disguiseManager, Creature creature, Teleport teleport, Blood blood, Chat chat,
|
||||
Portal portal, PreferencesManager preferences, InventoryManager inventoryManager, PacketHandler packetHandler,
|
||||
CosmeticManager cosmeticManager, ProjectileManager projectileManager, PetManager petManager, HologramManager hologramManager, String webAddress, PollManager pollManager,
|
||||
NpcManager npcManager, CustomDataManager customDataManager, Punish punish, EloManager eloManager)
|
||||
{
|
||||
super("Game Manager", plugin);
|
||||
|
||||
|
@ -303,8 +304,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
_gameTournamentManager = new GameTournamentManager(this);
|
||||
new GameStatManager(this);
|
||||
FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager);
|
||||
_bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager, npcManager, hologramManager, statsManager, _inventoryManager, petManager,
|
||||
facebookManager, _cosmeticManager.getGadgetManager());
|
||||
_bonusManager = new BonusManager(plugin, clientManager, serverStatusManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, _cosmeticManager.getGadgetManager());
|
||||
new GameLootManager(this, petManager, _bonusManager.getRewardManager());
|
||||
new GameSpectatorManager(this);
|
||||
_gameWorldManager = new GameWorldManager(this);
|
||||
|
@ -325,12 +325,15 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
//Champions Modules
|
||||
_energy = new Energy(plugin);
|
||||
|
||||
_itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, _energy, _fire, _projectileManager, webAddress);
|
||||
_itemFactory = new ItemFactory(_plugin, _blockRestore, _conditionManager, damageManager, _energy,
|
||||
_fire, _projectileManager, webAddress);
|
||||
|
||||
_skillFactory = new SkillFactory(plugin, damageManager, this, _damageManager.GetCombatManager(), _conditionManager, _projectileManager, _disguiseManager, _blockRestore, _fire, new Movement(
|
||||
plugin), teleport, _energy, webAddress);
|
||||
_skillFactory = new SkillFactory(plugin, damageManager, this, _damageManager.GetCombatManager(),
|
||||
_conditionManager, _projectileManager, _disguiseManager, _blockRestore, _fire, new Movement(plugin), teleport,
|
||||
_energy, webAddress);
|
||||
|
||||
_classManager = new ClassManager(plugin, clientManager, donationManager, _cosmeticManager.getGadgetManager(), _skillFactory, _itemFactory, webAddress);
|
||||
_classManager = new ClassManager(plugin, clientManager, donationManager, _cosmeticManager.getGadgetManager(), _skillFactory, _itemFactory,
|
||||
webAddress);
|
||||
|
||||
_classShopManager = new ClassShopManager(_plugin, _classManager, _skillFactory, _itemFactory, _achievementManager, clientManager);
|
||||
|
||||
|
@ -556,10 +559,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
return _serverStatusManager;
|
||||
}
|
||||
|
||||
public CustomDataManager getCustomDataManager()
|
||||
{
|
||||
return _customDataManager;
|
||||
}
|
||||
public CustomDataManager getCustomDataManager() { return _customDataManager; }
|
||||
|
||||
public ChatColor GetColor(Player player)
|
||||
{
|
||||
|
@ -703,8 +703,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
}
|
||||
}
|
||||
|
||||
String extrainformation = "|" + _serverConfig.ServerType + "|" + (_game == null ? "Unknown" : _game.GetName()) + "|"
|
||||
+ ((_game == null || _game.WorldData == null) ? "Unknown" : _game.WorldData.MapName);
|
||||
String extrainformation = "|" + _serverConfig.ServerType + "|" + (_game == null ? "Unknown" : _game.GetName())
|
||||
+ "|" + ((_game == null || _game.WorldData == null) ? "Unknown" : _game.WorldData.MapName);
|
||||
|
||||
if (_gameHostManager.isPrivateServer() && _gameHostManager.hasRank(Rank.TWITCH))
|
||||
extrainformation += "|HostRank." + _gameHostManager.getHostRank().toString();
|
||||
|
@ -810,14 +810,16 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
if (_game != null && !_game.GiveClock)
|
||||
return;
|
||||
|
||||
if (player.getOpenInventory().getType() != InventoryType.CRAFTING && player.getOpenInventory().getType() != InventoryType.CREATIVE)
|
||||
if (player.getOpenInventory().getType() != InventoryType.CRAFTING &&
|
||||
player.getOpenInventory().getType() != InventoryType.CREATIVE)
|
||||
return;
|
||||
|
||||
if (!UtilGear.isMat(player.getInventory().getItem(8), Material.WATCH) && !UtilGear.isMat(player.getInventory().getItem(8), Material.SPECKLED_MELON))
|
||||
{
|
||||
player.getInventory().setItem(
|
||||
8,
|
||||
ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte) 0, 1, (short) 0, C.cGreen + "Return to Hub", new String[] { "", ChatColor.RESET + "Click while holding this",
|
||||
ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte) 0, 1, (short) 0, C.cGreen
|
||||
+ "Return to Hub", new String[]{"", ChatColor.RESET + "Click while holding this",
|
||||
ChatColor.RESET + "to return to the Hub."}));
|
||||
|
||||
UtilInv.Update(player);
|
||||
|
@ -857,8 +859,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
return;
|
||||
}
|
||||
}
|
||||
if (_clientManager.Get(event.getPlayer().getName()).GetRank().has(event.getPlayer(), Rank.MODERATOR, false) || _clientManager.Get(event.getPlayer().getName()).GetRank() == Rank.MAPDEV
|
||||
|| _clientManager.Get(event.getPlayer().getName()).GetRank() == Rank.MAPLEAD)
|
||||
if (_clientManager.Get(event.getPlayer().getName()).GetRank().has(event.getPlayer(), Rank.MODERATOR, false) ||
|
||||
_clientManager.Get(event.getPlayer().getName()).GetRank() == Rank.MAPDEV ||
|
||||
_clientManager.Get(event.getPlayer().getName()).GetRank() == Rank.MAPLEAD)
|
||||
{
|
||||
event.allow();
|
||||
event.setResult(PlayerLoginEvent.Result.ALLOWED);
|
||||
|
@ -951,11 +954,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
}
|
||||
|
||||
/**
|
||||
* Checks if a player is participating in/has been participating in the
|
||||
* current game
|
||||
*
|
||||
* @param player
|
||||
* The player to check
|
||||
* Checks if a player is participating in/has been participating in the current game
|
||||
* @param player The player to check
|
||||
* @return Whether they are/have been playing
|
||||
*/
|
||||
public boolean hasBeenPlaying(Player player)
|
||||
|
@ -1037,7 +1037,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
{
|
||||
TimingManager.start("ArcadeManager LoadFiles");
|
||||
|
||||
File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar + "maps" + File.separatorChar + gameName);
|
||||
File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar
|
||||
+ "maps" + File.separatorChar + gameName);
|
||||
System.out.println(folder.getAbsolutePath()+" -=-=-=-=-=" );
|
||||
if (!folder.exists())
|
||||
folder.mkdirs();
|
||||
|
@ -1386,44 +1387,53 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
getCosmeticManager().getGadgetManager().setGadgetEnabled(playerCount <= 40);
|
||||
}
|
||||
|
||||
/*
|
||||
* public void saveBasicStats(final Game game) { if (!IsTournamentServer())
|
||||
* return;
|
||||
*
|
||||
* final Map<UUID, Boolean> data = new HashMap<>();
|
||||
*
|
||||
* for (Player loser : game.getLosers()) data.put(loser.getUniqueId(),
|
||||
* false);
|
||||
*
|
||||
* for (Player winner : game.getWinners()) data.put(winner.getUniqueId(),
|
||||
* true);
|
||||
*
|
||||
* Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable() {
|
||||
*
|
||||
* @Override public void run() {
|
||||
* getArcadeRepository().saveBasicStats(game.GetType(),
|
||||
* IsTournamentServer(), (int) (System.currentTimeMillis() -
|
||||
* game.getGameLiveTime()), data); } }); }
|
||||
*/
|
||||
/*public void saveBasicStats(final Game game)
|
||||
{
|
||||
if (!IsTournamentServer())
|
||||
return;
|
||||
|
||||
/*
|
||||
* public void saveLeaderboardStats(Game game) { final TournamentType type =
|
||||
* TournamentType.getTournamentType(game.GetType());
|
||||
*
|
||||
* if (type != null) { final Map<UUID, Boolean> data = new HashMap<>();
|
||||
*
|
||||
* for (Player loser : game.getLosers()) data.put(loser.getUniqueId(),
|
||||
* false);
|
||||
*
|
||||
* for (Player winner : game.getWinners()) data.put(winner.getUniqueId(),
|
||||
* true);
|
||||
*
|
||||
* Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable() {
|
||||
*
|
||||
* @Override public void run() {
|
||||
* getArcadeRepository().saveLeaderboardStats(0, type.ordinal(), data); }
|
||||
* }); } }
|
||||
*/
|
||||
final Map<UUID, Boolean> data = new HashMap<>();
|
||||
|
||||
for (Player loser : game.getLosers())
|
||||
data.put(loser.getUniqueId(), false);
|
||||
|
||||
for (Player winner : game.getWinners())
|
||||
data.put(winner.getUniqueId(), true);
|
||||
|
||||
Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
getArcadeRepository().saveBasicStats(game.GetType(), IsTournamentServer(), (int) (System.currentTimeMillis() - game.getGameLiveTime()), data);
|
||||
}
|
||||
});
|
||||
}*/
|
||||
|
||||
/*public void saveLeaderboardStats(Game game)
|
||||
{
|
||||
final TournamentType type = TournamentType.getTournamentType(game.GetType());
|
||||
|
||||
if (type != null)
|
||||
{
|
||||
final Map<UUID, Boolean> data = new HashMap<>();
|
||||
|
||||
for (Player loser : game.getLosers())
|
||||
data.put(loser.getUniqueId(), false);
|
||||
|
||||
for (Player winner : game.getWinners())
|
||||
data.put(winner.getUniqueId(), true);
|
||||
|
||||
Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), new Runnable()
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
getArcadeRepository().saveLeaderboardStats(0, type.ordinal(), data);
|
||||
}
|
||||
});
|
||||
}
|
||||
}*/
|
||||
|
||||
public boolean isGameInProgress()
|
||||
{
|
||||
|
@ -1627,8 +1637,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
}
|
||||
|
||||
/**
|
||||
* Returns whether this server has a file, stating that it allows game
|
||||
* commands.
|
||||
* Returns whether this server has a file, stating that it allows game commands.
|
||||
*
|
||||
* @return Whether this server is in game command mode.
|
||||
*/
|
||||
|
@ -1648,8 +1657,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
/**
|
||||
* Sets this server's game command mode state.
|
||||
*
|
||||
* @param state
|
||||
* Whether to enable or disable game commands.
|
||||
* @param state Whether to enable or disable game commands.
|
||||
*/
|
||||
public void setGameCommandMode(boolean state)
|
||||
{
|
||||
|
@ -1661,8 +1669,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||
* <p>
|
||||
* Sends a denial alert if they can't.
|
||||
*
|
||||
* @param player
|
||||
* The player attempting to use the command.
|
||||
* @param player The player attempting to use the command.
|
||||
* @return Whether or not the player can successfully use the command.
|
||||
*/
|
||||
public boolean canPlayerUseGameCmd(Player player)
|
||||
|
|
Loading…
Reference in New Issue