aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TrapMenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/TrapMenu.cpp')
-rw-r--r--Minecraft.World/TrapMenu.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/TrapMenu.cpp b/Minecraft.World/TrapMenu.cpp
index 5e59c6fe..da43347a 100644
--- a/Minecraft.World/TrapMenu.cpp
+++ b/Minecraft.World/TrapMenu.cpp
@@ -5,7 +5,7 @@
#include "Slot.h"
#include "TrapMenu.h"
-TrapMenu::TrapMenu(shared_ptr<Container> inventory, shared_ptr<DispenserTileEntity> trap)
+TrapMenu::TrapMenu(std::shared_ptr<Container> inventory, std::shared_ptr<DispenserTileEntity> trap)
{
this->trap = trap;
@@ -30,19 +30,19 @@ TrapMenu::TrapMenu(shared_ptr<Container> inventory, shared_ptr<DispenserTileEnti
}
}
-bool TrapMenu::stillValid(shared_ptr<Player> player)
+bool TrapMenu::stillValid(std::shared_ptr<Player> player)
{
return trap->stillValid(player);
}
// 4J Stu - Brought forward from 1.2
-shared_ptr<ItemInstance> TrapMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
+std::shared_ptr<ItemInstance> TrapMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
{
- shared_ptr<ItemInstance> clicked = nullptr;
+ std::shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots->at(slotIndex);
if (slot != NULL && slot->hasItem())
{
- shared_ptr<ItemInstance> stack = slot->getItem();
+ std::shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
if (slotIndex < INV_SLOT_START)