mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-08 12:48:32 +00:00
Code Issues Projects Releases Wiki Activity

Replace disallowed operators in src/player/

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-01-20 19:16:00 +00:00
parent 8f525ab399
commit 373880e582
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/player/OfflinePlayer.php
View File

@ -43,11 +43,11 @@ class OfflinePlayer implements IPlayer{
} }
public function getFirstPlayed() : ?int{ public function getFirstPlayed() : ?int{
return ($this->namedtag !== null and ($firstPlayedTag = $this->namedtag->getTag("firstPlayed")) instanceof LongTag) ? $firstPlayedTag->getValue() : null; return ($this->namedtag !== null && ($firstPlayedTag = $this->namedtag->getTag("firstPlayed")) instanceof LongTag) ? $firstPlayedTag->getValue() : null;
} }
public function getLastPlayed() : ?int{ public function getLastPlayed() : ?int{
return ($this->namedtag !== null and ($lastPlayedTag = $this->namedtag->getTag("lastPlayed")) instanceof LongTag) ? $lastPlayedTag->getValue() : null; return ($this->namedtag !== null && ($lastPlayedTag = $this->namedtag->getTag("lastPlayed")) instanceof LongTag) ? $lastPlayedTag->getValue() : null;
} }
public function hasPlayedBefore() : bool{ public function hasPlayedBefore() : bool{

94
src/player/Player.php
View File

@ -182,7 +182,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$lname = strtolower($name); $lname = strtolower($name);
$len = strlen($name); $len = strlen($name);
return $lname !== "rcon" and $lname !== "console" and $len >= 1 and $len <= 16 and preg_match("/[^A-Za-z0-9_ ]/", $name) === 0; return $lname !== "rcon" && $lname !== "console" && $len >= 1 && $len <= 16 && preg_match("/[^A-Za-z0-9_ ]/", $name) === 0;
} }
protected ?NetworkSession $networkSession; protected ?NetworkSession $networkSession;
@ -329,7 +329,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->firstPlayed = $nbt->getLong("firstPlayed", $now = (int) (microtime(true) * 1000)); $this->firstPlayed = $nbt->getLong("firstPlayed", $now = (int) (microtime(true) * 1000));
$this->lastPlayed = $nbt->getLong("lastPlayed", $now); $this->lastPlayed = $nbt->getLong("lastPlayed", $now);
if(!$this->server->getForceGamemode() and ($gameModeTag = $nbt->getTag("playerGameType")) instanceof IntTag){ if(!$this->server->getForceGamemode() && ($gameModeTag = $nbt->getTag("playerGameType")) instanceof IntTag){
$this->internalSetGameMode(GameModeIdMap::getInstance()->fromId($gameModeTag->getValue()) ?? GameMode::SURVIVAL()); //TODO: bad hack here to avoid crashes on corrupted data $this->internalSetGameMode(GameModeIdMap::getInstance()->fromId($gameModeTag->getValue()) ?? GameMode::SURVIVAL()); //TODO: bad hack here to avoid crashes on corrupted data
}else{ }else{
$this->internalSetGameMode($this->server->getGamemode()); $this->internalSetGameMode($this->server->getGamemode());
@ -447,7 +447,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function spawnTo(Player $player) : void{ public function spawnTo(Player $player) : void{
if($this->isAlive() and $player->isAlive() and $player->canSee($this) and !$this->isSpectator()){ if($this->isAlive() && $player->isAlive() && $player->canSee($this) && !$this->isSpectator()){
parent::spawnTo($player); parent::spawnTo($player);
} }
} }
@ -461,7 +461,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function setScreenLineHeight(?int $height) : void{ public function setScreenLineHeight(?int $height) : void{
if($height !== null and $height < 1){ if($height !== null && $height < 1){
throw new \InvalidArgumentException("Line height must be at least 1"); throw new \InvalidArgumentException("Line height must be at least 1");
} }
$this->lineHeight = $height; $this->lineHeight = $height;
@ -494,7 +494,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function canBeCollidedWith() : bool{ public function canBeCollidedWith() : bool{
return !$this->isSpectator() and parent::canBeCollidedWith(); return !$this->isSpectator() && parent::canBeCollidedWith();
} }
public function resetFallDistance() : void{ public function resetFallDistance() : void{
@ -523,7 +523,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function isConnected() : bool{ public function isConnected() : bool{
return $this->networkSession !== null and $this->networkSession->isConnected(); return $this->networkSession !== null && $this->networkSession->isConnected();
} }
public function getNetworkSession() : NetworkSession{ public function getNetworkSession() : NetworkSession{
@ -699,7 +699,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
protected function spawnEntitiesOnChunk(int $chunkX, int $chunkZ) : void{ protected function spawnEntitiesOnChunk(int $chunkX, int $chunkZ) : void{
foreach($this->getWorld()->getChunkEntities($chunkX, $chunkZ) as $entity){ foreach($this->getWorld()->getChunkEntities($chunkX, $chunkZ) as $entity){
if($entity !== $this and !$entity->isFlaggedForDespawn()){ if($entity !== $this && !$entity->isFlaggedForDespawn()){
$entity->spawnTo($this); $entity->spawnTo($this);
} }
} }
@ -728,7 +728,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$X = null; $X = null;
$Z = null; $Z = null;
World::getXZ($index, $X, $Z); World::getXZ($index, $X, $Z);
assert(is_int($X) and is_int($Z)); assert(is_int($X) && is_int($Z));
++$count; ++$count;
@ -826,7 +826,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* This is based on factors including the player's current render radius and current position. * This is based on factors including the player's current render radius and current position.
*/ */
protected function orderChunks() : void{ protected function orderChunks() : void{
if(!$this->isConnected() or $this->viewDistance === -1){ if(!$this->isConnected() || $this->viewDistance === -1){
return; return;
} }
@ -840,7 +840,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->location->getFloorX() >> Chunk::COORD_BIT_SIZE, $this->location->getFloorX() >> Chunk::COORD_BIT_SIZE,
$this->location->getFloorZ() >> Chunk::COORD_BIT_SIZE $this->location->getFloorZ() >> Chunk::COORD_BIT_SIZE
) as $hash){ ) as $hash){
if(!isset($this->usedChunks[$hash]) or $this->usedChunks[$hash]->equals(UsedChunkStatus::NEEDED())){ if(!isset($this->usedChunks[$hash]) || $this->usedChunks[$hash]->equals(UsedChunkStatus::NEEDED())){
$newOrder[$hash] = true; $newOrder[$hash] = true;
} }
unset($unloadChunks[$hash]); unset($unloadChunks[$hash]);
@ -852,7 +852,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
$this->loadQueue = $newOrder; $this->loadQueue = $newOrder;
if(count($this->loadQueue) > 0 or count($unloadChunks) > 0){ if(count($this->loadQueue) > 0 || count($unloadChunks) > 0){
$this->chunkLoader->setCurrentLocation($this->location); $this->chunkLoader->setCurrentLocation($this->location);
$this->getNetworkSession()->syncViewAreaCenterPoint($this->location, $this->viewDistance); $this->getNetworkSession()->syncViewAreaCenterPoint($this->location, $this->viewDistance);
} }
@ -888,14 +888,14 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/ */
public function hasReceivedChunk(int $chunkX, int $chunkZ) : bool{ public function hasReceivedChunk(int $chunkX, int $chunkZ) : bool{
$status = $this->usedChunks[World::chunkHash($chunkX, $chunkZ)] ?? null; $status = $this->usedChunks[World::chunkHash($chunkX, $chunkZ)] ?? null;
return $status !== null and $status->equals(UsedChunkStatus::SENT()); return $status !== null && $status->equals(UsedChunkStatus::SENT());
} }
/** /**
* Ticks the chunk-requesting mechanism. * Ticks the chunk-requesting mechanism.
*/ */
public function doChunkRequests() : void{ public function doChunkRequests() : void{
if($this->nextChunkOrderRun !== PHP_INT_MAX and $this->nextChunkOrderRun-- <= 0){ if($this->nextChunkOrderRun !== PHP_INT_MAX && $this->nextChunkOrderRun-- <= 0){
$this->nextChunkOrderRun = PHP_INT_MAX; $this->nextChunkOrderRun = PHP_INT_MAX;
$this->orderChunks(); $this->orderChunks();
} }
@ -919,7 +919,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function hasValidCustomSpawn() : bool{ public function hasValidCustomSpawn() : bool{
return $this->spawnPosition !== null and $this->spawnPosition->isValid(); return $this->spawnPosition !== null && $this->spawnPosition->isValid();
} }
/** /**
@ -1051,7 +1051,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* @param bool $literal whether a literal check should be performed * @param bool $literal whether a literal check should be performed
*/ */
public function isSurvival(bool $literal = false) : bool{ public function isSurvival(bool $literal = false) : bool{
return $this->gamemode->equals(GameMode::SURVIVAL()) or (!$literal and $this->gamemode->equals(GameMode::ADVENTURE())); return $this->gamemode->equals(GameMode::SURVIVAL()) || (!$literal && $this->gamemode->equals(GameMode::ADVENTURE()));
} }
/** /**
@ -1061,7 +1061,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* @param bool $literal whether a literal check should be performed * @param bool $literal whether a literal check should be performed
*/ */
public function isCreative(bool $literal = false) : bool{ public function isCreative(bool $literal = false) : bool{
return $this->gamemode->equals(GameMode::CREATIVE()) or (!$literal and $this->gamemode->equals(GameMode::SPECTATOR())); return $this->gamemode->equals(GameMode::CREATIVE()) || (!$literal && $this->gamemode->equals(GameMode::SPECTATOR()));
} }
/** /**
@ -1071,7 +1071,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* @param bool $literal whether a literal check should be performed * @param bool $literal whether a literal check should be performed
*/ */
public function isAdventure(bool $literal = false) : bool{ public function isAdventure(bool $literal = false) : bool{
return $this->gamemode->equals(GameMode::ADVENTURE()) or (!$literal and $this->gamemode->equals(GameMode::SPECTATOR())); return $this->gamemode->equals(GameMode::ADVENTURE()) || (!$literal && $this->gamemode->equals(GameMode::SPECTATOR()));
} }
public function isSpectator() : bool{ public function isSpectator() : bool{
@ -1082,7 +1082,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* TODO: make this a dynamic ability instead of being hardcoded * TODO: make this a dynamic ability instead of being hardcoded
*/ */
public function hasFiniteResources() : bool{ public function hasFiniteResources() : bool{
return $this->gamemode->equals(GameMode::SURVIVAL()) or $this->gamemode->equals(GameMode::ADVENTURE()); return $this->gamemode->equals(GameMode::SURVIVAL()) || $this->gamemode->equals(GameMode::ADVENTURE());
} }
public function isFireProof() : bool{ public function isFireProof() : bool{
@ -1129,7 +1129,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
foreach($this->getWorld()->getNearbyEntities($this->boundingBox->expandedCopy(1, 0.5, 1), $this) as $entity){ foreach($this->getWorld()->getNearbyEntities($this->boundingBox->expandedCopy(1, 0.5, 1), $this) as $entity){
$entity->scheduleUpdate(); $entity->scheduleUpdate();
if(!$entity->isAlive() or $entity->isFlaggedForDespawn()){ if(!$entity->isAlive() || $entity->isFlaggedForDespawn()){
continue; continue;
} }
@ -1180,7 +1180,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->nextChunkOrderRun = 0; $this->nextChunkOrderRun = 0;
} }
if(!$revert and $distanceSquared != 0){ if(!$revert && $distanceSquared != 0){
$dx = $newPos->x - $this->location->x; $dx = $newPos->x - $this->location->x;
$dy = $newPos->y - $this->location->y; $dy = $newPos->y - $this->location->y;
$dz = $newPos->z - $this->location->z; $dz = $newPos->z - $this->location->z;
@ -1209,7 +1209,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$delta = $to->distanceSquared($from); $delta = $to->distanceSquared($from);
$deltaAngle = abs($this->lastLocation->yaw - $to->yaw) + abs($this->lastLocation->pitch - $to->pitch); $deltaAngle = abs($this->lastLocation->yaw - $to->yaw) + abs($this->lastLocation->pitch - $to->pitch);
if($delta > 0.0001 or $deltaAngle > 1.0){ if($delta > 0.0001 || $deltaAngle > 1.0){
$ev = new PlayerMoveEvent($this, $from, $to); $ev = new PlayerMoveEvent($this, $from, $to);
$ev->call(); $ev->call();
@ -1291,7 +1291,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->lastUpdate = $currentTick; $this->lastUpdate = $currentTick;
if(!$this->isAlive() and $this->spawned){ if(!$this->isAlive() && $this->spawned){
$this->onDeathUpdate($tickDiff); $this->onDeathUpdate($tickDiff);
return true; return true;
} }
@ -1311,13 +1311,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->entityBaseTick($tickDiff); $this->entityBaseTick($tickDiff);
Timings::$entityBaseTick->stopTiming(); Timings::$entityBaseTick->stopTiming();
if(!$this->isSpectator() and $this->isAlive()){ if(!$this->isSpectator() && $this->isAlive()){
Timings::$playerCheckNearEntities->startTiming(); Timings::$playerCheckNearEntities->startTiming();
$this->checkNearEntities(); $this->checkNearEntities();
Timings::$playerCheckNearEntities->stopTiming(); Timings::$playerCheckNearEntities->stopTiming();
} }
if($this->blockBreakHandler !== null and !$this->blockBreakHandler->update()){ if($this->blockBreakHandler !== null && !$this->blockBreakHandler->update()){
$this->blockBreakHandler = null; $this->blockBreakHandler = null;
} }
} }
@ -1328,7 +1328,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function canBreathe() : bool{ public function canBreathe() : bool{
return $this->isCreative() or parent::canBreathe(); return $this->isCreative() || parent::canBreathe();
} }
/** /**
@ -1357,7 +1357,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$message = TextFormat::clean($message, false); $message = TextFormat::clean($message, false);
foreach(explode("\n", $message) as $messagePart){ foreach(explode("\n", $message) as $messagePart){
if(trim($messagePart) !== "" and strlen($messagePart) <= self::MAX_CHAT_BYTE_LENGTH and mb_strlen($messagePart, 'UTF-8') <= self::MAX_CHAT_CHAR_LENGTH and $this->messageCounter-- > 0){ if(trim($messagePart) !== "" && strlen($messagePart) <= self::MAX_CHAT_BYTE_LENGTH && mb_strlen($messagePart, 'UTF-8') <= self::MAX_CHAT_CHAR_LENGTH && $this->messageCounter-- > 0){
if(strpos($messagePart, './') === 0){ if(strpos($messagePart, './') === 0){
$messagePart = substr($messagePart, 1); $messagePart = substr($messagePart, 1);
} }
@ -1417,7 +1417,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$oldItem = clone $item; $oldItem = clone $item;
$ev = new PlayerItemUseEvent($this, $item, $directionVector); $ev = new PlayerItemUseEvent($this, $item, $directionVector);
if($this->hasItemCooldown($item) or $this->isSpectator()){ if($this->hasItemCooldown($item) || $this->isSpectator()){
$ev->cancel(); $ev->cancel();
} }
@ -1433,7 +1433,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
$this->resetItemCooldown($item); $this->resetItemCooldown($item);
if($this->hasFiniteResources() and !$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){ if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
if($item instanceof Durable && $item->isBroken()){ if($item instanceof Durable && $item->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
@ -1461,7 +1461,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
$ev->call(); $ev->call();
if($ev->isCancelled() or !$this->consumeObject($slot)){ if($ev->isCancelled() || !$this->consumeObject($slot)){
return false; return false;
} }
@ -1488,7 +1488,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
public function releaseHeldItem() : bool{ public function releaseHeldItem() : bool{
try{ try{
$item = $this->inventory->getItemInHand(); $item = $this->inventory->getItemInHand();
if(!$this->isUsingItem() or $this->hasItemCooldown($item)){ if(!$this->isUsingItem() || $this->hasItemCooldown($item)){
return false; return false;
} }
@ -1497,7 +1497,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$result = $item->onReleaseUsing($this); $result = $item->onReleaseUsing($this);
if($result->equals(ItemUseResult::SUCCESS())){ if($result->equals(ItemUseResult::SUCCESS())){
$this->resetItemCooldown($item); $this->resetItemCooldown($item);
if(!$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){ if(!$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
if($item instanceof Durable && $item->isBroken()){ if($item instanceof Durable && $item->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
@ -1522,7 +1522,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$ev = new PlayerBlockPickEvent($this, $block, $item); $ev = new PlayerBlockPickEvent($this, $block, $item);
$existingSlot = $this->inventory->first($item); $existingSlot = $this->inventory->first($item);
if($existingSlot === -1 and $this->hasFiniteResources()){ if($existingSlot === -1 && $this->hasFiniteResources()){
$ev->cancel(); $ev->cancel();
} }
$ev->call(); $ev->call();
@ -1591,13 +1591,13 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function continueBreakBlock(Vector3 $pos, int $face) : void{ public function continueBreakBlock(Vector3 $pos, int $face) : void{
if($this->blockBreakHandler !== null and $this->blockBreakHandler->getBlockPos()->distanceSquared($pos) < 0.0001){ if($this->blockBreakHandler !== null && $this->blockBreakHandler->getBlockPos()->distanceSquared($pos) < 0.0001){
$this->blockBreakHandler->setTargetedFace($face); $this->blockBreakHandler->setTargetedFace($face);
} }
} }
public function stopBreakBlock(Vector3 $pos) : void{ public function stopBreakBlock(Vector3 $pos) : void{
if($this->blockBreakHandler !== null and $this->blockBreakHandler->getBlockPos()->distanceSquared($pos) < 0.0001){ if($this->blockBreakHandler !== null && $this->blockBreakHandler->getBlockPos()->distanceSquared($pos) < 0.0001){
$this->blockBreakHandler = null; $this->blockBreakHandler = null;
} }
} }
@ -1616,7 +1616,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$item = $this->inventory->getItemInHand(); $item = $this->inventory->getItemInHand();
$oldItem = clone $item; $oldItem = clone $item;
if($this->getWorld()->useBreakOn($pos, $item, $this, true)){ if($this->getWorld()->useBreakOn($pos, $item, $this, true)){
if($this->hasFiniteResources() and !$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){ if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
if($item instanceof Durable && $item->isBroken()){ if($item instanceof Durable && $item->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
@ -1645,7 +1645,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$item = $this->inventory->getItemInHand(); //this is a copy of the real item $item = $this->inventory->getItemInHand(); //this is a copy of the real item
$oldItem = clone $item; $oldItem = clone $item;
if($this->getWorld()->useItemOn($pos, $item, $face, $clickOffset, $this, true)){ if($this->getWorld()->useItemOn($pos, $item, $face, $clickOffset, $this, true)){
if($this->hasFiniteResources() and !$item->equalsExact($oldItem) and $oldItem->equalsExact($this->inventory->getItemInHand())){ if($this->hasFiniteResources() && !$item->equalsExact($oldItem) && $oldItem->equalsExact($this->inventory->getItemInHand())){
if($item instanceof Durable && $item->isBroken()){ if($item instanceof Durable && $item->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
@ -1670,7 +1670,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
if(!$entity->isAlive()){ if(!$entity->isAlive()){
return false; return false;
} }
if($entity instanceof ItemEntity or $entity instanceof Arrow){ if($entity instanceof ItemEntity || $entity instanceof Arrow){
$this->logger->debug("Attempted to attack non-attackable entity " . get_class($entity)); $this->logger->debug("Attempted to attack non-attackable entity " . get_class($entity));
return false; return false;
} }
@ -1682,7 +1682,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
if(!$this->canInteract($entity->getLocation(), self::MAX_REACH_DISTANCE_ENTITY_INTERACTION)){ if(!$this->canInteract($entity->getLocation(), self::MAX_REACH_DISTANCE_ENTITY_INTERACTION)){
$this->logger->debug("Cancelled attack of entity " . $entity->getId() . " due to not currently being interactable"); $this->logger->debug("Cancelled attack of entity " . $entity->getId() . " due to not currently being interactable");
$ev->cancel(); $ev->cancel();
}elseif($this->isSpectator() or ($entity instanceof Player and !$this->server->getConfigGroup()->getConfigBool("pvp"))){ }elseif($this->isSpectator() || ($entity instanceof Player && !$this->server->getConfigGroup()->getConfigBool("pvp"))){
$ev->cancel(); $ev->cancel();
} }
@ -1691,14 +1691,14 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$meleeEnchantments = []; $meleeEnchantments = [];
foreach($heldItem->getEnchantments() as $enchantment){ foreach($heldItem->getEnchantments() as $enchantment){
$type = $enchantment->getType(); $type = $enchantment->getType();
if($type instanceof MeleeWeaponEnchantment and $type->isApplicableTo($entity)){ if($type instanceof MeleeWeaponEnchantment && $type->isApplicableTo($entity)){
$meleeEnchantmentDamage += $type->getDamageBonus($enchantment->getLevel()); $meleeEnchantmentDamage += $type->getDamageBonus($enchantment->getLevel());
$meleeEnchantments[] = $enchantment; $meleeEnchantments[] = $enchantment;
} }
} }
$ev->setModifier($meleeEnchantmentDamage, EntityDamageEvent::MODIFIER_WEAPON_ENCHANTMENTS); $ev->setModifier($meleeEnchantmentDamage, EntityDamageEvent::MODIFIER_WEAPON_ENCHANTMENTS);
if(!$this->isSprinting() and !$this->isFlying() and $this->fallDistance > 0 and !$this->effectManager->has(VanillaEffects::BLINDNESS()) and !$this->isUnderwater()){ if(!$this->isSprinting() && !$this->isFlying() && $this->fallDistance > 0 && !$this->effectManager->has(VanillaEffects::BLINDNESS()) && !$this->isUnderwater()){
$ev->setModifier($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL); $ev->setModifier($ev->getFinalDamage() / 2, EntityDamageEvent::MODIFIER_CRITICAL);
} }
@ -1712,7 +1712,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
$this->getWorld()->addSound($soundPos, new EntityAttackSound()); $this->getWorld()->addSound($soundPos, new EntityAttackSound());
if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0 and $entity instanceof Living){ if($ev->getModifier(EntityDamageEvent::MODIFIER_CRITICAL) > 0 && $entity instanceof Living){
$entity->broadcastAnimation(new CriticalHitAnimation($entity)); $entity->broadcastAnimation(new CriticalHitAnimation($entity));
} }
@ -1725,7 +1725,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
if($this->isAlive()){ if($this->isAlive()){
//reactive damage like thorns might cause us to be killed by attacking another mob, which //reactive damage like thorns might cause us to be killed by attacking another mob, which
//would mean we'd already have dropped the inventory by the time we reached here //would mean we'd already have dropped the inventory by the time we reached here
if($heldItem->onAttackEntity($entity) and $this->hasFiniteResources() and $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival if($heldItem->onAttackEntity($entity) && $this->hasFiniteResources() && $oldItem->equalsExact($this->inventory->getItemInHand())){ //always fire the hook, even if we are survival
if($heldItem instanceof Durable && $heldItem->isBroken()){ if($heldItem instanceof Durable && $heldItem->isBroken()){
$this->broadcastSound(new ItemBreakSound()); $this->broadcastSound(new ItemBreakSound());
} }
@ -1899,7 +1899,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
* @param int $fadeOut Title fade-out time in ticks. * @param int $fadeOut Title fade-out time in ticks.
*/ */
public function setTitleDuration(int $fadeIn, int $stay, int $fadeOut) : void{ public function setTitleDuration(int $fadeIn, int $stay, int $fadeOut) : void{
if($fadeIn >= 0 and $stay >= 0 and $fadeOut >= 0){ if($fadeIn >= 0 && $stay >= 0 && $fadeOut >= 0){
$this->getNetworkSession()->onTitleDuration($fadeIn, $stay, $fadeOut); $this->getNetworkSession()->onTitleDuration($fadeIn, $stay, $fadeOut);
} }
} }
@ -2286,11 +2286,11 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
if($this->isCreative() if($this->isCreative()
and $source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE && $source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE
and $source->getCause() !== EntityDamageEvent::CAUSE_VOID && $source->getCause() !== EntityDamageEvent::CAUSE_VOID
){ ){
$source->cancel(); $source->cancel();
}elseif($this->allowFlight and $source->getCause() === EntityDamageEvent::CAUSE_FALL){ }elseif($this->allowFlight && $source->getCause() === EntityDamageEvent::CAUSE_FALL){
$source->cancel(); $source->cancel();
} }
@ -2315,7 +2315,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
} }
public function broadcastAnimation(Animation $animation, ?array $targets = null) : void{ public function broadcastAnimation(Animation $animation, ?array $targets = null) : void{
if($this->spawned and $targets === null){ if($this->spawned && $targets === null){
$targets = $this->getViewers(); $targets = $this->getViewers();
$targets[] = $this; $targets[] = $this;
} }

2
src/player/SurvivalBlockBreakHandler.php
View File

@ -105,7 +105,7 @@ final class SurvivalBlockBreakHandler{
$this->breakProgress += $this->breakSpeed; $this->breakProgress += $this->breakSpeed;
if(($this->fxTicker++ % $this->fxTickInterval) === 0 and $this->breakProgress < 1){ if(($this->fxTicker++ % $this->fxTickInterval) === 0 && $this->breakProgress < 1){
$this->player->getWorld()->addParticle($this->blockPos, new BlockPunchParticle($this->block, $this->targetedFace)); $this->player->getWorld()->addParticle($this->blockPos, new BlockPunchParticle($this->block, $this->targetedFace));
$this->player->getWorld()->addSound($this->blockPos, new BlockPunchSound($this->block)); $this->player->getWorld()->addSound($this->blockPos, new BlockPunchSound($this->block));
$this->player->broadcastAnimation(new ArmSwingAnimation($this->player), $this->player->getViewers()); $this->player->broadcastAnimation(new ArmSwingAnimation($this->player), $this->player->getViewers());