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.

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

Bump docker/build-push-action from 6.7.0 to 6.9.0 #494

Open
wants to merge 2 commits into
base: stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
run: echo NAME=$(echo "${GITHUB_REPOSITORY,,}") >> $GITHUB_OUTPUT

- name: Build image for tag
uses: docker/build-push-action@v6.8.0
uses: docker/build-push-action@v6.9.0
with:
push: true
context: ./pocketmine-mp
Expand All @@ -66,7 +66,7 @@ jobs:

- name: Build image for major tag
if: steps.channel.outputs.CHANNEL == 'stable'
uses: docker/build-push-action@v6.8.0
uses: docker/build-push-action@v6.9.0
with:
push: true
context: ./pocketmine-mp
Expand All @@ -79,7 +79,7 @@ jobs:

- name: Build image for minor tag
if: steps.channel.outputs.CHANNEL == 'stable'
uses: docker/build-push-action@v6.8.0
uses: docker/build-push-action@v6.9.0
with:
push: true
context: ./pocketmine-mp
Expand All @@ -92,7 +92,7 @@ jobs:

- name: Build image for latest tag
if: steps.channel.outputs.CHANNEL == 'stable'
uses: docker/build-push-action@v6.8.0
uses: docker/build-push-action@v6.9.0
with:
push: true
context: ./pocketmine-mp
Expand Down
4 changes: 2 additions & 2 deletions src/entity/Human.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ public function jump() : void{
}
}

public function emote(string $emoteId, int $emoteLengthTicks) : void{
public function emote(string $emoteId) : void{
NetworkBroadcastUtils::broadcastEntityEvent(
$this->getViewers(),
fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onEmote($recipients, $this, $emoteId, $emoteLengthTicks)
fn(EntityEventBroadcaster $broadcaster, array $recipients) => $broadcaster->onEmote($recipients, $this, $emoteId)
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/network/mcpe/EntityEventBroadcaster.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@ public function onPickUpItem(array $recipients, Entity $collector, Entity $picke
/**
* @param NetworkSession[] $recipients
*/
public function onEmote(array $recipients, Human $from, string $emoteId, int $emoteLengthTicks) : void;
public function onEmote(array $recipients, Human $from, string $emoteId) : void;
}
2 changes: 1 addition & 1 deletion src/network/mcpe/handler/InGamePacketHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ public function handleLevelSoundEvent(LevelSoundEventPacket $packet) : bool{
}

public function handleEmote(EmotePacket $packet) : bool{
$this->player->emote($packet->getEmoteId(), $this->session->getProtocolId() >= ProtocolInfo::PROTOCOL_1_21_30 ? $packet->getEmoteLengthTicks() : 0);
$this->player->emote($packet->getEmoteId());
return true;
}
}
2 changes: 2 additions & 0 deletions src/network/mcpe/handler/ResourcePacksPacketHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,11 @@ public function setUp() : void{
//TODO: support forcing server packs
$this->session->sendDataPacket(ResourcePacksInfoPacket::create(
resourcePackEntries: $resourcePackEntries,
behaviorPackEntries: [],
mustAccept: $this->mustAccept,
hasAddons: false,
hasScripts: false,
forceServerPacks: false,
cdnUrls: []
));
$this->session->getLogger()->debug("Waiting for client to accept resource packs");
Expand Down
4 changes: 2 additions & 2 deletions src/player/Player.php
Original file line number Diff line number Diff line change
Expand Up @@ -2019,15 +2019,15 @@ public function toggleSwim(bool $swim) : bool{
return true;
}

public function emote(string $emoteId, int $emoteLengthTicks) : void{
public function emote(string $emoteId) : void{
$currentTick = $this->server->getTick();
if($currentTick - $this->lastEmoteTick > 5){
$this->lastEmoteTick = $currentTick;
$event = new PlayerEmoteEvent($this, $emoteId);
$event->call();
if(!$event->isCancelled()){
$emoteId = $event->getEmoteId();
parent::emote($emoteId, $emoteLengthTicks);
parent::emote($emoteId);
}
}
}
Expand Down
Loading