aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/EnchantmentMenu.cpp
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.World/EnchantmentMenu.cpp
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.World/EnchantmentMenu.cpp')
-rw-r--r--Minecraft.World/EnchantmentMenu.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/EnchantmentMenu.cpp b/Minecraft.World/EnchantmentMenu.cpp
index 23b366ce..fa769bf9 100644
--- a/Minecraft.World/EnchantmentMenu.cpp
+++ b/Minecraft.World/EnchantmentMenu.cpp
@@ -17,9 +17,9 @@ EnchantmentMenu::EnchantmentMenu(shared_ptr<Inventory> inventory, Level *level,
}
this->level = level;
- this->x = xt;
- this->y = yt;
- this->z = zt;
+ x = xt;
+ y = yt;
+ z = zt;
addSlot(new EnchantmentSlot(enchantSlots, 0, 21 + 4, 43 + 4));
for (int y = 0; y < 3; y++)
@@ -53,9 +53,9 @@ void EnchantmentMenu::broadcastChanges()
// 4J Added m_costsChanged to stop continually sending update packets even when no changes have been made
if(m_costsChanged)
{
- for (int i = 0; i < containerListeners->size(); i++)
+ for (int i = 0; i < containerListeners.size(); i++)
{
- ContainerListener *listener = containerListeners->at(i);
+ ContainerListener *listener = containerListeners.at(i);
listener->setContainerData(this, 0, costs[0]);
listener->setContainerData(this, 1, costs[1]);
listener->setContainerData(this, 2, costs[2]);
@@ -162,7 +162,7 @@ bool EnchantmentMenu::clickMenuButton(shared_ptr<Player> player, int i)
vector<EnchantmentInstance *> *newEnchantment = EnchantmentHelper::selectEnchantment(&random, item, costs[i]);
if (newEnchantment != NULL)
{
- player->withdrawExperienceLevels(costs[i]);
+ player->giveExperienceLevels(-costs[i]);
if (isBook) item->id = Item::enchantedBook_Id;
int randomIndex = isBook ? random.nextInt(newEnchantment->size()) : -1;
//for (EnchantmentInstance e : newEnchantment)
@@ -216,8 +216,8 @@ bool EnchantmentMenu::stillValid(shared_ptr<Player> player)
shared_ptr<ItemInstance> EnchantmentMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
{
shared_ptr<ItemInstance> clicked = nullptr;
- Slot *slot = slots->at(slotIndex);
- Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);
+ Slot *slot = slots.at(slotIndex);
+ Slot *IngredientSlot = slots.at(INGREDIENT_SLOT);
if (slot != NULL && slot->hasItem())
{