i
This commit is contained in:
@@ -7,8 +7,11 @@
|
||||
#include <client/Minecraft.h>
|
||||
#include <network/packet/ChatPacket.h>
|
||||
#include <network/packet/MovePlayerPacket.h>
|
||||
#include <network/packet/RemoveItemPacket.h>
|
||||
#include <network/packet/TakeItemPacket.h>
|
||||
#include <world/entity/player/Inventory.h>
|
||||
|
||||
// TODO: Optimize includes
|
||||
class LuaPlayer {
|
||||
public:
|
||||
LuaPlayer(const RakNet::RakNetGUID source) : m_source(source) {}
|
||||
@@ -68,7 +71,48 @@ public:
|
||||
auto plr = getPlayer();
|
||||
if (plr == nullptr) return;
|
||||
|
||||
plr->inventory->add(new ItemInstance(id, count, auxValue));
|
||||
auto mc = PluginsManager::get().getMinecraft();
|
||||
ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
|
||||
auto item = new ItemInstance(id, count, auxValue);
|
||||
|
||||
if (!plr->inventory->add(item)) {
|
||||
plr->inventory->add(item);
|
||||
}
|
||||
|
||||
TakeItemPacket itemAdd(plr->entityId, count, auxValue, id);
|
||||
ss->sendPrivate(itemAdd, m_source);
|
||||
}
|
||||
|
||||
std::tuple<int, int, int> getItem(int index) {
|
||||
auto plr = getPlayer();
|
||||
if (plr == nullptr) return {0, 0, 0};
|
||||
|
||||
auto item = plr->inventory->getItem(index);
|
||||
|
||||
if (item != nullptr) {
|
||||
return {item->id, item->count, item->getAuxValue()};
|
||||
} else {
|
||||
return {0, 0, 0};
|
||||
}
|
||||
}
|
||||
|
||||
void clearInventory() {
|
||||
auto plr = getPlayer();
|
||||
if (plr == nullptr) return;
|
||||
|
||||
auto mc = PluginsManager::get().getMinecraft();
|
||||
ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
|
||||
|
||||
for (int i = Inventory::MAX_SELECTION_SIZE; i < plr->inventory->getContainerSize(); i++) {
|
||||
auto itm = plr->inventory->getItem(i);
|
||||
|
||||
if (itm != NULL) {
|
||||
printf("remove %d \n", plr->inventory->removeResource(ItemInstance(itm->id, itm->count, itm->getAuxValue())));
|
||||
RemoveItemPacket itemAdd(plr->entityId, itm->count, itm->getAuxValue(), itm->id);
|
||||
ss->sendPrivate(itemAdd, m_source);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
sol::table getInventory() {
|
||||
|
||||
@@ -73,7 +73,10 @@ void PluginsManager::registerTypes() {
|
||||
"getPos", &LuaPlayer::getPos,
|
||||
"setPos", &LuaPlayer::setPos,
|
||||
"sendMessage", &LuaPlayer::sendMessage,
|
||||
"getInventory", &LuaPlayer::getInventory
|
||||
"getInventory", &LuaPlayer::getInventory,
|
||||
"addItem", &LuaPlayer::addItem,
|
||||
"getItem", &LuaPlayer::getItem,
|
||||
"clearInventory", &LuaPlayer::clearInventory
|
||||
);
|
||||
|
||||
m_lua["Server"] = &m_srv;
|
||||
|
||||
Reference in New Issue
Block a user