From e5562d81f4af9863e5715d1e1ec03230499f5b65 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 31 May 2025 02:56:23 +0300 Subject: [PATCH] added ability to drop single items(atipls when repocket) --- src/Player.php | 21 +++++++++++++++++---- src/PocketMinecraftServer.php | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/Player.php b/src/Player.php index 503993a6..14cbf6d0 100755 --- a/src/Player.php +++ b/src/Player.php @@ -2494,14 +2494,24 @@ class Player{ $packet->eid = $this->eid; $prevItem = $packet->item; - $newItem = $this->getSlot($this->slot); + $newItem = $this->getHeldItem(); + //TODO it is possible to drop non-held item in vanilla, but in 99% cases it wouldnt happen + if($newItem->getID() != $prevItem->getID() || $newItem->getMetadata() != $prevItem->getMetadata()){ + ConsoleAPI::debug("{$this->username} tried dropping item from non-held slot or inventory desynchronized."); + $this->sendInventory(); + return; + } + if($newItem->count < $prevItem->count){ ConsoleAPI::warn("{$this->username} tried dropping too many items(serverside stack has {$newItem->count}, tried dropping {$prevItem->count}."); $this->sendInventory(); return; } - - $packet->item = $newItem; + if(Player::$allowDroppingSingleItems){ + $packet->item = BlockAPI::getItem($newItem->getID(), $newItem->getMetadata(), $prevItem->count); + }else{ + $packet->item = $newItem; + } $sendOnDrop = false; if($prevItem->getID() != $packet->item->getID() || $prevItem->getMetadata() != $packet->item->getMetadata()){ @@ -2538,7 +2548,10 @@ class Player{ $sY += ($this->entity->random->nextFloat() - $this->entity->random->nextFloat()) * 0.1; $sZ += sin($f3) * $f1; $this->server->api->entity->dropRawPos($this->level, $this->entity->x, $this->entity->y - 0.3 + $this->entity->height - 0.12, $this->entity->z, $packet->item, $sX, $sY, $sZ); - $this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), $sendOnDrop); + $newItem->count -= $packet->item->count; + if($newItem->count <= 0){ + $this->setSlot($this->slot, BlockAPI::getItem(0, 0, 0), false); + } }else{ $this->sendInventory(); //send if blocked } diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index ac306df3..ded4a551 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -96,13 +96,13 @@ class PocketMinecraftServer{ "keep-items-on-death" => Entity::$keepInventory, "disable-emojis-in-chat" => Player::$disableEmojisInChat, "disable-emojis-on-signs" => Level::$disableEmojisOnSigns, - //"allow-dropping-single-items" => Player::$allowDroppingSingleItems + "allow-dropping-single-items" => Player::$allowDroppingSingleItems ]); Player::$disableEmojisInChat = $this->extraprops->get("disable-emojis-in-chat"); Level::$disableEmojisOnSigns = $this->extraprops->get("disable-emojis-on-signs"); Entity::$keepInventory = $this->extraprops->get("keep-items-on-death"); Player::$experimentalHotbar = $this->extraprops->get("use-experimental-hotbar"); - //Player::$allowDroppingSingleItems = $this->extraprops->get("allow-dropping-single-items"); + Player::$allowDroppingSingleItems = $this->extraprops->get("allow-dropping-single-items"); Living::$despawnMobs = $this->extraprops->get("despawn-mobs"); Living::$despawnTimer = $this->extraprops->get("mob-despawn-ticks"); Living::$entityPushing = $this->extraprops->get("enable-mob-pushing");