From 4a84258f3e433e488c9bcdd49cc586cf7f530d75 Mon Sep 17 00:00:00 2001 From: Harmonic Date: Wed, 29 Apr 2020 18:34:21 -0400 Subject: [PATCH] Revert "Temp patch to CatalogBuyItemEvent" This reverts commit 4c16c25508b5aae7627f775a680da5ee1fa87d16 --- .../incoming/catalog/CatalogBuyItemEvent.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java index f3a4a8d5..f7cc5ad7 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java @@ -5,7 +5,10 @@ import com.eu.habbo.habbohotel.catalog.CatalogItem; import com.eu.habbo.habbohotel.catalog.CatalogManager; import com.eu.habbo.habbohotel.catalog.CatalogPage; import com.eu.habbo.habbohotel.catalog.ClubOffer; -import com.eu.habbo.habbohotel.catalog.layouts.*; +import com.eu.habbo.habbohotel.catalog.layouts.ClubBuyLayout; +import com.eu.habbo.habbohotel.catalog.layouts.RecentPurchasesLayout; +import com.eu.habbo.habbohotel.catalog.layouts.RoomBundleLayout; +import com.eu.habbo.habbohotel.catalog.layouts.VipBuyLayout; import com.eu.habbo.habbohotel.items.FurnitureType; import com.eu.habbo.habbohotel.users.HabboBadge; import com.eu.habbo.habbohotel.users.HabboInventory; @@ -21,7 +24,6 @@ import com.eu.habbo.messages.outgoing.users.*; import com.eu.habbo.threading.runnables.ShutdownEmulator; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TObjectProcedure; -import org.apache.commons.lang3.StringUtils; public class CatalogBuyItemEvent extends MessageHandler { @Override @@ -188,14 +190,7 @@ public class CatalogBuyItemEvent extends MessageHandler { item = this.client.getHabbo().getHabboStats().getRecentPurchases().get(itemId); else item = page.getCatalogItem(itemId); - - // temp patch, can a dev with better knowledge than me look into this asap pls. - if (page instanceof PetsLayout) { - String check = extraData.replace("\n", ""); - if (!StringUtils.isAlphanumeric(check)) { - return; - } - } + Emulator.getGameEnvironment().getCatalogManager().purchaseItem(page, item, this.client.getHabbo(), count, extraData, false); } else {