phaneron/smartcmd-MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-05-26 21:03:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

finish rewrite; port to cmake, loads of other changes

Browse source 
Theres documentation at https://sylvessa.zip/fourkit/ now. And a bunch of other changes. Check the discord server for a more comprehensive list
This commit is contained in:
sylvessa 2026-03-21 13:52:26 -05:00
parent ecb3f00bd6
commit f5f9aa1cf5
107 changed files with 14289 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Minecraft.World/ItemEntity.cpp
View file

@ -12,6 +12,9 @@
#include "com.mojang.nbt.h"
#include "ItemEntity.h"
#include "SoundTypes.h"
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
#include "..\Minecraft.Server\FourKitBridge.h"
#endif
@ -232,8 +235,27 @@ void ItemEntity::playerTouch(shared_ptr<Player> player)
}
int orgCount = item->count;
if (throwTime == 0 && player->inventory->add(item))
if (throwTime == 0)
{
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
{
int outItemId = item->id, outItemCount = orgCount, outItemAux = item->getAuxValue();
if (FourKitBridge::FirePlayerPickupItem(
player->entityId, entityId, player->dimension,
x, y, z,
item->id, orgCount, item->getAuxValue(), 0,
&outItemId, &outItemCount, &outItemAux))
return;
if (outItemId != item->id || outItemCount != orgCount || outItemAux != item->getAuxValue())
{
item = std::make_shared<ItemInstance>(outItemId, outItemCount, outItemAux);
setItem(item);
orgCount = outItemCount;
}
}
#endif
if (player->inventory->add(item))
{
//if (item.id == Tile.treeTrunk.id) player.awardStat(Achievements.mineWood);
//if (item.id == Item.leather.id) player.awardStat(Achievements.killCow);
//if (item.id == Item.diamond.id) player.awardStat(Achievements.diamonds);
@ -260,6 +282,7 @@ void ItemEntity::playerTouch(shared_ptr<Player> player)
player->take(shared_from_this(), orgCount);
// System.out.println(item.count + ", " + orgCount);
if (item->count <= 0) remove();
}
}
}