mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Item: added getStateId(), removed state data from public API

Browse Source 
state data was only used for indexing stuff along with state ID anyway, so it makes more sense to lock it away in here instead.
This commit is contained in:
Dylan K. Taylor
2023-05-16 14:14:18 +01:00
parent 015c668885
commit c9bb4335a1
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/player/Player.php
View File

@ -146,7 +146,6 @@ use function max;
use function mb_strlen;
use function microtime;
use function min;
use function morton2d_encode;
use function preg_match;
use function spl_object_id;
use function sqrt;
@ -687,7 +686,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/
public function getItemCooldownExpiry(Item $item) : int{
$this->checkItemCooldowns();
return $this->usedItemsCooldown[morton2d_encode($item->getTypeId(), $item->computeStateData())] ?? 0;
return $this->usedItemsCooldown[$item->getStateId()] ?? 0;
}
/**
@ -695,7 +694,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/
public function hasItemCooldown(Item $item) : bool{
$this->checkItemCooldowns();
return isset($this->usedItemsCooldown[morton2d_encode($item->getTypeId(), $item->computeStateData())]);
return isset($this->usedItemsCooldown[$item->getStateId()]);
}
/**
@ -704,7 +703,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
public function resetItemCooldown(Item $item, ?int $ticks = null) : void{
$ticks = $ticks ?? $item->getCooldownTicks();
if($ticks > 0){
$this->usedItemsCooldown[morton2d_encode($item->getTypeId(), $item->computeStateData())] = $this->server->getTick() + $ticks;
$this->usedItemsCooldown[$item->getStateId()] = $this->server->getTick() + $ticks;
}
}