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

uuid bug fixed finally!

Browse Source
This commit is contained in:
NewGarbo 2015-11-25 00:47:35 +00:00
parent aa52c1be27
commit 3cb22c8cb7
4 changed files with 3 additions and 10 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.java
View File

@ -119,7 +119,7 @@ public class Clans extends JavaPlugin
GearManager customGear = new GearManager(this, packetHandler, _clientManager, _donationManager);
HologramManager hologram = new HologramManager(this);
_clansManager = new ClansManager(this, serverStatusManager.getCurrentServerName(), _clientManager, _donationManager, preferenceManager, blockRestore, teleport, chat, customGear, hologram, webServerAddress);
_clansManager = new ClansManager(this, serverStatusManager.getCurrentServerName(), packetHandler, _clientManager, _donationManager, preferenceManager, blockRestore, teleport, chat, customGear, hologram, webServerAddress);
new Recipes(this);
new Farming(this);
new BuildingShop(_clansManager, _clientManager, _donationManager);

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

@ -294,7 +294,7 @@ public class ClansGame extends MiniPlugin
// Doors, chests, & furnaces
if (!access.equals(ClanRelation.SELF) && event.getAction() == Action.RIGHT_CLICK_BLOCK && loc.getBlock().getType().name().contains("DOOR") || UtilItem.doesHaveGUI(loc.getBlock().getType()))
{
UtilPlayer.message(player, F.main("Clans", "You are not allowed to use here."));
UtilPlayer.message(player, F.main("Clans", "You are not allowed to use that here."));
event.setCancelled(true);
}

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

@ -172,7 +172,7 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
// Spawn area
public ClansManager(JavaPlugin plugin, String serverName, CoreClientManager clientManager, DonationManager donationManager, PreferencesManager preferencesManager, BlockRestore blockRestore, Teleport teleport, Chat chat, GearManager gearManager, HologramManager hologramManager, String webServerAddress)
public ClansManager(JavaPlugin plugin, String serverName, PacketHandler packetHandler, CoreClientManager clientManager, DonationManager donationManager, PreferencesManager preferencesManager, BlockRestore blockRestore, Teleport teleport, Chat chat, GearManager gearManager, HologramManager hologramManager, String webServerAddress)
{
super("Clans Manager", plugin);
@ -190,7 +190,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
_goldManager = new GoldManager(this, _clientManager, donationManager);
_gearManager = gearManager;
_lootManager = new LootManager(gearManager, _goldManager);
PacketHandler packetHandler = new PacketHandler(plugin);
_disguiseManager = new DisguiseManager(plugin, packetHandler);
Creature creature = new Creature(plugin);
_npcManager = new NpcManager(plugin, creature);

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

@ -220,12 +220,6 @@ public class ClansCommand extends CommandBase<ClansManager>
return;
}
if (Recharge.Instance.use(caller, "Clan Create", 30000, false, false))
{
UtilPlayer.message(caller, F.main("Clans", "You may not spam the Clan create command."));
return;
}
if (!UtilInput.valid(args[1]))
{
UtilPlayer.message(caller, F.main("Clans", "Invalid characters in Clan name."));