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

Fixed merge conflicts

Browse Source
This commit is contained in:
AlexTheCoder 2017-09-23 03:42:45 -04:00
parent 0da2691a87
commit 76e74efced
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansAdmin.java
View File

@ -260,8 +260,10 @@ public class ClansAdmin
{
public void run()
{
if (nameExists.booleanValue())
if (nameExists)
{
UtilPlayer.message(caller, F.main("Clans Admin", "Clan name cannot be a Player name."));
}
else
{
Clans.getClanDataAccess().create(caller.getName(), args[2], true, new Callback<ClanInfo>()

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

@ -142,8 +142,10 @@ import mineplex.minecraft.game.classcombat.Class.ClientClass;
import mineplex.minecraft.game.classcombat.Class.IPvpClass;
import mineplex.minecraft.game.classcombat.Class.repository.token.CustomBuildToken;
import mineplex.minecraft.game.classcombat.Condition.SkillConditionManager;
import mineplex.minecraft.game.classcombat.Skill.Mage.events.FissureModifyBlockEvent;
import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
import mineplex.minecraft.game.classcombat.Skill.Assassin.Blink;
import mineplex.minecraft.game.classcombat.Skill.Assassin.Flash;
import mineplex.minecraft.game.classcombat.Skill.Mage.events.FissureModifyBlockEvent;
import mineplex.minecraft.game.classcombat.item.ItemFactory;
import mineplex.minecraft.game.classcombat.shop.ClassCombatShop;
import mineplex.minecraft.game.classcombat.shop.ClassShopManager;
@ -382,6 +384,8 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
return true;
});
((Blink)skillManager.GetSkill("Blink")).setAllowTrapping(true);
((Flash)skillManager.GetSkill("Flash")).setAllowTrapping(true);
registerEvents(new Listener()
{
@EventHandler

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

@ -738,7 +738,7 @@ public class ClansUtility
@Override
public void run(Boolean data)
{
if (!data.booleanValue())
if (!data)
{
UtilPlayer.message(caller, F.main("Clans", "There was an error processing your request. Try again later"));
}

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/invsee/ui/InvseeInventory.java
View File

@ -123,7 +123,7 @@ public class InvseeInventory implements Listener
{
if (event.getPlayer().getUniqueId().equals(_uuid) && !_canOpenInventory)
{
Bukkit.getScheduler().runTaskLater(UtilServer.getPlugin(), () -> {event.getPlayer().closeInventory();}, 20);
Bukkit.getScheduler().runTaskLater(UtilServer.getPlugin(), () -> event.getPlayer().closeInventory(), 20);
}
}

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
View File

@ -78,8 +78,8 @@ public class GoldManager extends MiniDbClientPlugin<GoldData>
_donationManager = donationManager;
_serverId = dataAccessLayer.getRepository().getServerId();
_transferTracker = new TransferTracker();
_itemSet = new HashSet<Item>();
_playerPickupMap = new HashMap<Player, Integer>();
_itemSet = new HashSet<>();
_playerPickupMap = new HashMap<>();
_bankShop = new BankShop(plugin, clientManager, donationManager);
generatePermissions();