Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add flight speed #6076

Open
wants to merge 17 commits into
base: minor-next
Choose a base branch
from
Open

Add flight speed #6076

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4627f0f
Add fly speed
Sergittos Oct 7, 2023
ba3b1a1
Prevent players from having a negative fly speed
Sergittos Oct 7, 2023
8fe90e9
Fix CS
Sergittos Oct 7, 2023
76aa130
Merge branch 'pmmp:stable' into fly-speed-request
Sergittos Jan 19, 2024
30bd1b6
Remove unrelated changes of the pull request
Sergittos Jan 19, 2024
149a70b
Rename identifiers for better code understanding
Sergittos Jan 19, 2024
9562152
Merge branch 'minor-next' into fly-speed-request
Sergittos Mar 30, 2024
e269cee
Player: Reverse the conditions when setting the flight speed
Sergittos Mar 30, 2024
db299da
Why did I delete this
Sergittos Mar 30, 2024
d5c6f7e
Merge branch 'minor-next' into fly-speed-request
Sergittos Jun 14, 2024
549dd6f
Allow players to have a negative fly speed
Sergittos Jun 14, 2024
d037a38
Add some documentation
IvanCraft623 Jun 18, 2024
c30bef2
Merge branch 'minor-next' into fly-speed-request
Sergittos Jun 22, 2024
6735ef1
Merge branch 'minor-next' into fly-speed-request
Sergittos Jul 20, 2024
9315fd8
Add more documentation
Sergittos Jul 20, 2024
ec52a3d
CS fix
IvanCraft623 Sep 2, 2024
2bf0129
Merge branch 'minor-next' into fly-speed-request
IvanCraft623 Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/network/mcpe/NetworkSession.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,8 +1050,7 @@ public function syncAbilities(Player $for) : void{
];

$layers = [
//TODO: dynamic flying speed! FINALLY!!!!!!!!!!!!!!!!!
new AbilitiesLayer(AbilitiesLayer::LAYER_BASE, $boolAbilities, 0.05, 0.1),
new AbilitiesLayer(AbilitiesLayer::LAYER_BASE, $boolAbilities, $for->getFlightSpeed(), 0.1),
];
if(!$for->hasBlockCollision()){
//TODO: HACK! In 1.19.80, the client starts falling in our faux spectator mode when it clips into a
Expand Down
15 changes: 15 additions & 0 deletions src/player/Player.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
private const MAX_REACH_DISTANCE_SURVIVAL = 7;
private const MAX_REACH_DISTANCE_ENTITY_INTERACTION = 8;

public const DEFAULT_FLIGHT_SPEED = 0.05;

public const TAG_FIRST_PLAYED = "firstPlayed"; //TAG_Long
public const TAG_LAST_PLAYED = "lastPlayed"; //TAG_Long
private const TAG_GAME_MODE = "playerGameType"; //TAG_Int
Expand Down Expand Up @@ -278,6 +280,8 @@ public static function isValidUserName(?string $name) : bool{
protected bool $blockCollision = true;
protected bool $flying = false;

protected float $flightSpeed = self::DEFAULT_FLIGHT_SPEED;

/** @phpstan-var positive-int|null */
protected ?int $lineHeight = null;
protected string $locale = "en_US";
Expand Down Expand Up @@ -515,6 +519,17 @@ public function hasAutoJump() : bool{
return $this->autoJump;
}

public function setFlightSpeed(float $flightSpeed) : void{
if($this->flightSpeed !== $flightSpeed){
$this->flightSpeed = $flightSpeed;
$this->getNetworkSession()->syncAbilities($this);
}
}

public function getFlightSpeed() : float{
return $this->flightSpeed;
}

public function spawnTo(Player $player) : void{
if($this->isAlive() && $player->isAlive() && $player->canSee($this) && !$this->isSpectator()){
parent::spawnTo($player);
Expand Down