unfix of particial fix

This commit is contained in:
GameHerobrine 2023-01-23 23:56:50 +03:00
parent fa8176d380
commit f864e4db38
3 changed files with 20 additions and 20 deletions

View file

@ -399,7 +399,7 @@ class BlockAPI{
return $this->cancelAction($target, $player, false); return $this->cancelAction($target, $player, false);
} }
if(($player->gamemode & 0x01) === 0 and $item->useOn($target) and $item->getMetadata() >= $item->getMaxDurability()){ if(($player->gamemode & 0x01) === 0 and $item->useOn($target) and $item->getMetadata() >= $item->getMaxDurability()){
$player->setSlot($player->slot, new Item(AIR, 0, 0), true); $player->setSlot($player->slot, new Item(AIR, 0, 0), false);
} }
}else{ }else{
return $this->cancelAction($target, $player, false); return $this->cancelAction($target, $player, false);
@ -469,7 +469,7 @@ class BlockAPI{
if($item->isActivable === true and $item->onActivate($player->level, $player, $block, $target, $face, $fx, $fy, $fz) === true){ if($item->isActivable === true and $item->onActivate($player->level, $player, $block, $target, $face, $fx, $fy, $fz) === true){
if($item->count <= 0){ if($item->count <= 0){
$player->setSlot($player->slot, BlockAPI::getItem(AIR, 0, 0), true); $player->setSlot($player->slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
return false; return false;
} }

View file

@ -722,7 +722,7 @@ class Player{
$pk->target = $data["entity"]->eid; $pk->target = $data["entity"]->eid;
$this->dataPacket($pk); $this->dataPacket($pk);
if(($this->gamemode & 0x01) === 0x00){ if(($this->gamemode & 0x01) === 0x00){
$this->addItem($data["entity"]->type, $data["entity"]->meta, $data["entity"]->stack, true); $this->addItem($data["entity"]->type, $data["entity"]->meta, $data["entity"]->stack, false);
} }
switch($data["entity"]->type){ switch($data["entity"]->type){
case WOOD: case WOOD:
@ -1738,12 +1738,12 @@ class Player{
} }
$slot = $this->armor[$i]; $slot = $this->armor[$i];
if($slot->getID() !== AIR and $s->getID() === AIR){ if($slot->getID() !== AIR and $s->getID() === AIR){
$this->addItem($slot->getID(), $slot->getMetadata(), 1, true); $this->addItem($slot->getID(), $slot->getMetadata(), 1, false);
$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0); $this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
$packet->slots[$i] = 255; $packet->slots[$i] = 255;
}elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){ }elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){
$this->armor[$i] = $this->getSlot($sl); $this->armor[$i] = $this->getSlot($sl);
$this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0), true); $this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0), false);
}elseif($s->getID() !== AIR and $slot->getID() !== AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s->getID())) !== false){ }elseif($s->getID() !== AIR and $slot->getID() !== AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s->getID())) !== false){
$item = $this->armor[$i]; $item = $this->armor[$i];
$this->armor[$i] = $this->getSlot($sl); $this->armor[$i] = $this->getSlot($sl);
@ -1853,10 +1853,10 @@ class Player{
$this->entity->heal($items[$slot->getID()], "eating"); $this->entity->heal($items[$slot->getID()], "eating");
--$slot->count; --$slot->count;
if($slot->count <= 0){ if($slot->count <= 0){
$this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), true); $this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
if($slot->getID() === MUSHROOM_STEW or $slot->getID() === BEETROOT_SOUP){ if($slot->getID() === MUSHROOM_STEW or $slot->getID() === BEETROOT_SOUP){
$this->addItem(BOWL, 0, 1, true); $this->addItem(BOWL, 0, 1, false);
} }
} }
break; break;
@ -1887,7 +1887,7 @@ class Player{
$sZ += sin($f3) * $f1; $sZ += sin($f3) * $f1;
$this->server->api->entity->dropRawPos(new Position($this->entity->x, $this->entity->y - 0.3 + $this->entity->height - 0.12, $this->entity->z, $this->level), $packet->item, $sX, $sY, $sZ); $this->server->api->entity->dropRawPos(new Position($this->entity->x, $this->entity->y - 0.3 + $this->entity->height - 0.12, $this->entity->z, $this->level), $packet->item, $sX, $sY, $sZ);
$this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), true); $this->setSlot($this->slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
if($this->entity->inAction === true){ if($this->entity->inAction === true){
$this->entity->inAction = false; $this->entity->inAction = false;
@ -2053,17 +2053,17 @@ class Player{
} }
if($item->getID() !== AIR and $slot->getID() == $item->getID()){ if($item->getID() !== AIR and $slot->getID() == $item->getID()){
if($slot->count < $item->count){ if($slot->count < $item->count){
if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, true) === false){ if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, false) === false){
break; break;
} }
}elseif($slot->count > $item->count){ }elseif($slot->count > $item->count){
$this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, true); $this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, false);
} }
}else{ }else{
if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, true) === false){ if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, false) === false){
break; break;
} }
$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, true); $this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, false);
} }
$tile->setSlot($slotn, $item, true, $offset); $tile->setSlot($slotn, $item, true, $offset);
}else{ }else{
@ -2099,17 +2099,17 @@ class Player{
if($item->getID() !== AIR and $slot->getID() == $item->getID()){ if($item->getID() !== AIR and $slot->getID() == $item->getID()){
if($slot->count < $item->count){ if($slot->count < $item->count){
if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, true) === false){ if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, false) === false){
break; break;
} }
}elseif($slot->count > $item->count){ }elseif($slot->count > $item->count){
$this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, true); $this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, false);
} }
}else{ }else{
if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, true) === false){ if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, false) === false){
break; break;
} }
$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, true); $this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, false);
} }
$tile->setSlot($packet->slot, $item); $tile->setSlot($packet->slot, $item);
} }
@ -2252,15 +2252,15 @@ class Player{
$s = $this->getSlot($slot); $s = $this->getSlot($slot);
$s->count -= $item->count; $s->count -= $item->count;
if($s->count <= 0){ if($s->count <= 0){
$this->setSlot($slot, BlockAPI::getItem(AIR, 0, 0), true); $this->setSlot($slot, BlockAPI::getItem(AIR, 0, 0), false);
} }
} }
foreach($craft as $slot => $item){ foreach($craft as $slot => $item){
$s = $this->getSlot($slot); $s = $this->getSlot($slot);
if($s->count <= 0 or $s->getID() === AIR){ if($s->count <= 0 or $s->getID() === AIR){
$this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $item->count), true); $this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $item->count), false);
}else{ }else{
$this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $s->count + $item->count), true); $this->setSlot($slot, BlockAPI::getItem($item->getID(), $item->getMetadata(), $s->count + $item->count), false);
} }
switch($item->getID()){ switch($item->getID()){
case WORKBENCH: case WORKBENCH:

View file

@ -9,7 +9,7 @@ class FlintSteelItem extends ItemTool{
public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
if(($player->gamemode & 0x01) === 0 and $this->useOn($block) and $this->getMetadata() >= $this->getMaxDurability()){ if(($player->gamemode & 0x01) === 0 and $this->useOn($block) and $this->getMetadata() >= $this->getMaxDurability()){
$player->setSlot($player->slot, new Item(AIR, 0, 0), true); //TODO check $player->setSlot($player->slot, new Item(AIR, 0, 0), false); //TODO check
} }
if($block->getID() === AIR and ($target instanceof SolidBlock)){ if($block->getID() === AIR and ($target instanceof SolidBlock)){