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

Merge branch 'master' of ssh://198.245.50.91:7999/min/master

Browse Source
This commit is contained in:
Chiss 2013-09-02 15:07:27 +10:00
commit d5fd95c53b
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguisePacketTracker.java
View File

@ -1,20 +0,0 @@
package mineplex.core.disguise;
import mineplex.core.packethandler.PacketArrayList;
import net.minecraft.server.v1_6_R2.Packet;
import org.bukkit.entity.Player;
public class DisguisePacketTracker
{
public Packet Packet;
public Player Owner;
public PacketArrayList PacketList;
public DisguisePacketTracker(Packet packet, Player owner, PacketArrayList packetList)
{
Packet = packet;
Owner = owner;
PacketList = packetList;
}
}

10
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/page/SkillPage.java
View File

@ -139,7 +139,7 @@ public class SkillPage extends ShopPageBase<ClassShopManager, ClassCombatShop>
skillLore.set(i, C.cGray + skillLore.get(i));
}
boolean locked = !skill.IsFree() && !DonationManager.Get(Player.getName()).Owns(skill.GetSalesPackageId()) && !Client.GetRank().Has(Rank.ULTRA);
boolean locked = isSkillLocked(skill.GetSalesPackageId(), skill);
ShopItem skillItem = new ShopItem(locked ? Material.BOOK_AND_QUILL : ((skill.GetUsers().contains(Player) || _purchasing) ? Material.WRITTEN_BOOK : Material.BOOK), (locked ? ChatColor.RED + skill.GetName() + " (Locked)" : skill.GetName()), skillLore.toArray(new String[skillLore.size()]), 1, locked, true);
if (_purchasing)
@ -234,4 +234,12 @@ public class SkillPage extends ShopPageBase<ClassShopManager, ClassCombatShop>
}
}, this, new SkillSalesPackage(skill), CurrencyType.Gems, player));
}
private boolean isSkillLocked(int skillId, ISkill skill)
{
if (skill.IsFree() || DonationManager.Get(Player.getName()).Owns(skillId) || ClientManager.Get(Player.getName()).GetRank().Has(Rank.ULTRA) || DonationManager.Get(Player.getName()).OwnsUnknownPackage("Competitive ULTRA"))
return false;
return true;
}
}

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -59,7 +59,7 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin
private CoreClientManager _clientManager;
private DonationManager _donationManager;
private DamageManager _damageManager;
private Utility _utility;
private Utility _utility;
private BlockRegenerate _blockRegenerate;
private BlockRestore _blockRestore;
private Blood _blood;
@ -70,7 +70,7 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin
private LootFactory _lootFactory;
private Observer _observer;
private PetManager _petManager;
private me.chiss.Core.Server.Server _serverModule;
private me.chiss.Core.Server.Server _serverModule;
private Spawn _spawn;
private Teleport _teleport;
private ProjectileManager _throw;
@ -107,12 +107,13 @@ public class Arcade extends JavaPlugin implements INautilusPlugin, IPlugin
GetSpawn();
GetTeleport();
DisguiseManager disguiseManager = new DisguiseManager(this, new PacketHandler(this));
PacketHandler packetHandler = new PacketHandler(this);
DisguiseManager disguiseManager = new DisguiseManager(this, packetHandler);
_damageManager = new DamageManager(this, new CombatManager(this), new NpcManager(this, GetCreature()), disguiseManager);
//Arcade Manager
_gameManager = new ArcadeManager(this, ReadServerConfig(), _clientManager, _donationManager, conditionManager, _damageManager, disguiseManager, GetCreature(), GetBlood(), new PacketHandler(this));
_gameManager = new ArcadeManager(this, ReadServerConfig(), _clientManager, _donationManager, conditionManager, _damageManager, disguiseManager, GetCreature(), GetBlood(), packetHandler);
//Unreferenced Modules
//new AntiStack();