From 5e307da15a57f5d190846b63eeb6c3674fa9d383 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Mon, 19 Oct 2015 01:32:12 -0500 Subject: [PATCH] Fix for inventory failure. --- .../src/mineplex/core/benefit/BenefitManager.java | 2 +- .../src/mineplex/core/cosmetic/ui/page/PetTagPage.java | 1 - .../src/mineplex/core/inventory/InventoryManager.java | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java index 0301e0225..a6caf2cdb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java @@ -31,7 +31,7 @@ public class BenefitManager extends MiniDbClientPlugin //_benefits.add(new Christmas2014(plugin, _repository, inventoryManager)); //_benefits.add(new Thanksgiving2014(plugin, _repository, inventoryManager)); - //_benefits.add(new Players40k(this, _repository, inventoryManager)); + _benefits.add(new Players43k(this, _repository, inventoryManager)); } @EventHandler(priority = EventPriority.LOWEST) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java index bebe91708..7477a2492 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java @@ -110,7 +110,6 @@ public class PetTagPage extends ShopPageBase getPlugin().getPetManager().Get(getPlayer()).GetPets().put(_pet.GetPetType(), token.PetName); - getPlugin().getInventoryManager().addItemToInventory(null, getPlayer(), _pet.GetPetType().toString(), 1); getShop().openPageForPlayer(getPlayer(), new Menu(getPlugin(), getShop(), getClientManager(), getDonationManager(), getPlayer())); } }, null, _petPurchase ? _pet : tag, CurrencyType.Coins, getPlayer())); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java index c7c76207a..2560f2891 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java @@ -89,11 +89,6 @@ public class InventoryManager extends MiniDbClientPlugin if (!success) { System.out.println("Add item to Inventory FAILED for " + player.getName()); - - if (_items.containsKey(item)) - { - Get(player).addItem(new ClientItem(_items.get(item), -count)); - } } if (callback != null)