Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dries-c committed Dec 24, 2024
2 parents 42d92d0 + f5daac3 commit bdf59a4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @pmmp/server-developers
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ updates:
directory: "/"
schedule:
interval: monthly
groups:
github-actions:
patterns: ["*"]
10 changes: 8 additions & 2 deletions src/types/inventory/stackrequest/LoomStackRequestAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,22 @@ final class LoomStackRequestAction extends ItemStackRequestAction{
public const ID = ItemStackRequestActionType::CRAFTING_LOOM;

public function __construct(
private string $patternId
private string $patternId,
private int $repetitions = 1
){}

public function getPatternId() : string{ return $this->patternId; }

public function getRepetitions() : int{ return $this->repetitions; }

public static function read(PacketSerializer $in) : self{
return new self($in->getString());
$patternId = $in->getString();
$repetitions = $in->getByte();
return new self($patternId, $repetitions);
}

public function write(PacketSerializer $out) : void{
$out->putString($this->patternId);
$out->putByte($this->repetitions);
}
}
2 changes: 1 addition & 1 deletion src/types/skin/SkinData.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct(
private string $resourcePatch,
private SkinImage $skinImage,
private array $animations = [],
SkinImage $capeImage = null,
?SkinImage $capeImage = null,
private string $geometryData = "",
private string $geometryDataEngineVersion = ProtocolInfo::MINECRAFT_VERSION_NETWORK,
private string $animationData = "",
Expand Down

0 comments on commit bdf59a4

Please sign in to comment.