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

Temporarily disable clans maps

Browse Source
This commit is contained in:
AlexTheCoder 2017-06-19 18:53:34 -04:00 committed by cnr
parent 185ac9fc05
commit 7868287ace
7 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
View File

@ -377,7 +377,7 @@ public class ClansGame extends MiniPlugin
@EventHandler
public void respawn(PlayerRespawnEvent event)
{
_clans.getItemMapManager().setMap(event.getPlayer());
//_clans.getItemMapManager().setMap(event.getPlayer());
}
@EventHandler(priority = EventPriority.LOW)

14
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -221,7 +221,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
private ProjectileManager _projectileManager;
private WorldEventManager _worldEvent;
private Chat _chat;
private ItemMapManager _itemMapManager;
// private ItemMapManager _itemMapManager;
private DisguiseManager _disguiseManager;
private NpcManager _npcManager;
private Explosion _explosion;
@ -305,7 +305,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
_clanGame = new ClansGame(plugin, this);
_clanUtility = new ClansUtility(this);
_tutorial = new TutorialManager(plugin, clientManager, donationManager, chat, hologramManager, this, _npcManager, _taskManager);
_itemMapManager = new ItemMapManager(this, _tutorial, _worldEvent);
// _itemMapManager = new ItemMapManager(this, _tutorial, _worldEvent);
new TntGeneratorManager(plugin, this);
new SupplyDropManager(plugin, this);
@ -492,7 +492,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
addCommand(new ClansChatCommand(this));
addCommand(new ClansAllyChatCommand(this));
addCommand(new ClanManagementCommand(this));
addCommand(new MapCommand(this));
// addCommand(new MapCommand(this));
addCommand(new SpeedCommand(this));
}
@ -563,10 +563,10 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
return _inventoryManager;
}
public ItemMapManager getItemMapManager()
{
return _itemMapManager;
}
// public ItemMapManager getItemMapManager()
// {
// return _itemMapManager;
// }
public Explosion getExplosion()
{

24
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
View File

@ -987,18 +987,18 @@ public class ClansCommand extends CommandBase<ClansManager>
Plugin.getClanUtility().unclaimAll(caller);
}
public void map(Player caller, String[] args)
{
ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "map");
UtilServer.getServer().getPluginManager().callEvent(event);
if (event.isCancelled())
{
return;
}
Plugin.getItemMapManager().setMap(caller);
}
// public void map(Player caller, String[] args)
// {
// ClansCommandExecutedEvent event = new ClansCommandExecutedEvent(caller, "map");
// UtilServer.getServer().getPluginManager().callEvent(event);
//
// if (event.isCancelled())
// {
// return;
// }
//
// Plugin.getItemMapManager().setMap(caller);
// }
public void home(final Player caller, String[] args)
{

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/MapCommand.java
View File

@ -33,6 +33,6 @@ public class MapCommand extends CommandBase<ClansManager>
@Override
public void Execute(Player caller, String[] args)
{
Plugin.getItemMapManager().setMap(caller);
//Plugin.getItemMapManager().setMap(caller);
}
}

14
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/nether/NetherManager.java
View File

@ -469,13 +469,13 @@ public class NetherManager extends MiniPlugin
}
}
UtilServer.getPlayersCollection()
.stream()
.filter(player -> isInNether(player))
.forEach(player ->
{
ClansManager.getInstance().getItemMapManager().removeMap(player);
});
// UtilServer.getPlayersCollection()
// .stream()
// .filter(player -> isInNether(player))
// .forEach(player ->
// {
// ClansManager.getInstance().getItemMapManager().removeMap(player);
// });
}
}

22
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/RaidManager.java
View File

@ -157,17 +157,17 @@ public class RaidManager extends MiniPlugin
@EventHandler
public void update(UpdateEvent event)
{
if (event.getType() == UpdateType.TICK)
{
UtilServer.getPlayersCollection()
.stream()
.filter(player -> isInRaid(player.getLocation()))
.forEach(player ->
{
ClansManager.getInstance().getItemMapManager().removeMap(player);
});
return;
}
// if (event.getType() == UpdateType.TICK)
// {
// UtilServer.getPlayersCollection()
// .stream()
// .filter(player -> isInRaid(player.getLocation()))
// .forEach(player ->
// {
// ClansManager.getInstance().getItemMapManager().removeMap(player);
// });
// return;
// }
if (event.getType() != UpdateType.SEC)
{
return;

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
View File

@ -128,7 +128,7 @@ public class ClansMainTutorial extends Tutorial
player.teleport(Spawn.getNorthSpawn());
UtilInv.Clear(player);
ClansManager.getInstance().getItemMapManager().setMap(player);
// ClansManager.getInstance().getItemMapManager().setMap(player);
}, 20 * 10L);
player.setWalkSpeed(0.2F);