From 5458c049835881f9f2e9475be8a9a2fffe3ac013 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Mon, 12 May 2025 23:54:18 +0300 Subject: [PATCH] fixed metadata check in useitem --- src/Player.php | 6 ++++-- src/recipes/CraftingRecipes.php | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Player.php b/src/Player.php index d8ff8073..e72ead92 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1996,8 +1996,10 @@ class Player{ //nc: check item desync $heldItem = $this->getHeldItem(); - if($heldItem->getID() != $packet->item || $heldItem->getMetadata() != $packet->meta){ - ConsoleAPI::warn("{$this->username}'s heldItem doesnt match on clientside({$packet->item} {$packet->meta}) and serverside({$heldItem->getID()} {$heldItem->getMetadata()}) when using item. Resending inventory."); + $pmeta = ($packet->meta & 0xff); + $hmeta = ($heldItem->getMetadata() & 0xff); //in 0.8.1 useitempacket uses byte for meta + if($heldItem->getID() != $packet->item || $hmeta != $pmeta){ + ConsoleAPI::warn("{$this->username}'s heldItem doesnt match on clientside({$packet->item} {$pmeta}) and serverside({$heldItem->getID()} {$hmeta}) when using item. Resending inventory."); $this->sendInventory(); if($packet->face >= 0 && $packet->face <= 5){ $target = $this->level->getBlock($blockVector); diff --git a/src/recipes/CraftingRecipes.php b/src/recipes/CraftingRecipes.php index ec2c8b4d..20aefbbd 100644 --- a/src/recipes/CraftingRecipes.php +++ b/src/recipes/CraftingRecipes.php @@ -311,20 +311,15 @@ class CraftingRecipes{ $needcnt -= $it[2]; } if($needcnt != 0) { - console("awa"); goto skip_recipe; } }else{ $exceptedIndex = ($item[0] << 16) | ($item[1] & 0xffff); if(!isset($recipeItems[$exceptedIndex])) { - - console("awa1"); goto skip_recipe; //dont check count if no idmeta pair is in ingridients } $it = $recipeItems[$exceptedIndex]; if($it[0] != $item[0] || $it[1] != $item[1] || $it[2] != $item[2]) { - - console("awa2"); goto skip_recipe; } }