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

Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

This commit is contained in:
Chiss 2014-08-09 19:55:35 +10:00
parent ff6ea3c798 b0f6435661
commit 06a444bae6
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
View File

@ -112,6 +112,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
public void run() public void run()
{ {
Plugin.getInventoryManager().addItemToInventory(Player, gadget.getGadgetType().name(), gadget.GetName(), (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo().getQuantity() : gadget.getQuantity())); Plugin.getInventoryManager().addItemToInventory(Player, gadget.getGadgetType().name(), gadget.GetName(), (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo().getQuantity() : gadget.getQuantity()));
Refresh();
} }
}, this, (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo() : gadget), CurrencyType.Coins, Player)); }, this, (gadget instanceof ItemGadget ? ((ItemGadget)gadget).getAmmo() : gadget), CurrencyType.Coins, Player));
} }

1
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/MountPage.java
View File

@ -93,6 +93,7 @@ public class MountPage extends ShopPageBase<CosmeticManager, CosmeticShop>
public void run() public void run()
{ {
Plugin.getInventoryManager().addItemToInventory(Player, "Mount", mount.GetName(), 1); Plugin.getInventoryManager().addItemToInventory(Player, "Mount", mount.GetName(), 1);
Refresh();
} }
}, this, mount, CurrencyType.Coins, Player)); }, this, mount, CurrencyType.Coins, Player));
} }

7
Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
View File

@ -68,6 +68,11 @@ public class InventoryManager extends MiniClientPlugin<ClientInventory>
{ {
final String uuidString = player.getUniqueId().toString(); final String uuidString = player.getUniqueId().toString();
if (_items.containsKey(item))
{
Get(player).addItem(new ClientItem(_items.get(item), count));
}
Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable() Bukkit.getServer().getScheduler().runTaskAsynchronously(GetPlugin(), new Runnable()
{ {
public void run() public void run()
@ -94,8 +99,6 @@ public class InventoryManager extends MiniClientPlugin<ClientInventory>
updateItems(); updateItems();
Get(player).addItem(new ClientItem(_items.get(item), count));
synchronized (_inventoryLock) synchronized (_inventoryLock)
{ {
_repository.incrementClientInventoryItem(uuidString, _items.get(item).Id, count); _repository.incrementClientInventoryItem(uuidString, _items.get(item).Id, count);