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

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex

Browse Source
This commit is contained in:
Chiss 2014-04-21 17:06:08 +10:00
commit 62c245d728
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/ClassCombatShop.java
View File

@ -50,6 +50,8 @@ public class ClassCombatShop extends ShopBase<ClassShopManager>
if (clientClass != null && clientClass.IsSavingCustomBuild())
{
clientClass.SetActiveCustomBuild(clientClass.GetGameClass(), clientClass.GetSavingCustomBuild());
clientClass.EquipCustomBuild(clientClass.GetSavingCustomBuild(), false);
clientClass.SaveActiveCustomBuild();
}
}

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

@ -96,7 +96,6 @@ public class CustomBuildPage extends ShopPageBase<ClassShopManager, ClassCombatS
{
if (customBuild == null)
{
System.out.println("new build");
customBuild = new CustomBuildToken(_pvpClass.GetType());
customBuild.CustomBuildNumber = i;
customBuild.Name = "Build " + (i + 1);

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

@ -296,20 +296,18 @@ public class SkillPage extends ShopPageBase<ClassShopManager, ClassCombatShop>
//Add Select Information
itemLore.add("");
itemLore.add("");
if (!hasItem)
{
itemLore.add(C.cYellow + "Item Token Cost: " + C.cWhite + item.getTokenCost());
itemLore.add(C.cYellow + "Item Tokens Remaining: " + C.cWhite + clientClass.GetSavingCustomBuild().ItemTokens + "/" + CustomBuildToken.MAX_ITEM_TOKENS);
itemLore.add("");
if (clientClass.GetSavingCustomBuild().ItemTokens >= item.getTokenCost())
{
itemLore.add(C.cGreen + "Left-Click to Select");
}
else
{
itemLore.add(C.cRed + "You don't have enough Item Tokens.");
}
itemLore.add(C.cYellow + "Item Token Cost: " + C.cWhite + item.getTokenCost());
itemLore.add(C.cYellow + "Item Tokens Remaining: " + C.cWhite + clientClass.GetSavingCustomBuild().ItemTokens + "/" + CustomBuildToken.MAX_ITEM_TOKENS);
itemLore.add("");
if (clientClass.GetSavingCustomBuild().ItemTokens >= item.getTokenCost())
{
itemLore.add(C.cGreen + "Left-Click to Select");
}
else
{
itemLore.add(C.cRed + "You don't have enough Item Tokens.");
}
//Color Gray

4
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R2/Entity.java
View File

@ -1455,8 +1455,8 @@ public abstract class Entity {
if (entity == null) {
if (this.vehicle != null) {
// CraftBukkit start
if ((this.bukkitEntity instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) {
VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
if ((this.bukkitEntity instanceof LivingEntity)) {
VehicleExitEvent event = new VehicleExitEvent(this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
pluginManager.callEvent(event);
if (event.isCancelled() || this.vehicle != originalVehicle) {