* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
43 lines
1.1 KiB
C++
43 lines
1.1 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include "net.minecraft.world.entity.player.h"
|
|
#include "EmptyMapItem.h"
|
|
|
|
EmptyMapItem::EmptyMapItem(int id) : ComplexItem(id)
|
|
{
|
|
}
|
|
|
|
shared_ptr<ItemInstance> EmptyMapItem::use(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player)
|
|
{
|
|
//shared_ptr<ItemInstance> map = shared_ptr<ItemInstance>( new ItemInstance(Item::map, 1, level->getFreeAuxValueFor(L"map")) );
|
|
|
|
//String id = "map_" + map.getAuxValue();
|
|
//MapItemSavedData data = new MapItemSavedData(id);
|
|
//level.setSavedData(id, data);
|
|
|
|
//data.scale = 0;
|
|
//int scale = MapItemSavedData.MAP_SIZE * 2 * (1 << data.scale);
|
|
//data.x = (int) (Math.round(player.x / scale) * scale);
|
|
//data.z = (int) (Math.round(player.z / scale) * scale);
|
|
//data.dimension = (byte) level.dimension.id;
|
|
|
|
//data.setDirty();
|
|
|
|
shared_ptr<ItemInstance> map = std::make_shared<ItemInstance>(Item::map, 1, -1);
|
|
Item::map->onCraftedBy(map, level, player);
|
|
|
|
itemInstance->count--;
|
|
if (itemInstance->count <= 0)
|
|
{
|
|
return map;
|
|
}
|
|
else
|
|
{
|
|
if (!player->inventory->add(map->copy()))
|
|
{
|
|
player->drop(map);
|
|
}
|
|
}
|
|
|
|
return itemInstance;
|
|
} |