Skip to content

Commit eb88754

Browse files
committed
Merge branch '1.0-develop' into lukas
2 parents 8b3b1f9 + 01fd763 commit eb88754

File tree

462 files changed

+4406
-2260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+4406
-2260
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ public/assets/manifest.json
2121
# For local development with docker
2222
# Remove if we ever put the Dockerfile in the repo
2323
.dockerignore
24-
docker-compose.yml
24+
docker-compose.*
25+
!docker-compose.example.yml
26+
!docker-compose.example.yaml
2527

2628
# for image related files
2729
misc
@@ -33,4 +35,3 @@ resources/lang/locales.js
3335
/public/build
3436
/public/hot
3537
result
36-
docker-compose.yaml

.php-cs-fixer.dist.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
use PhpCsFixer\Config;
44
use PhpCsFixer\Finder;
5+
use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
56

67
$finder = (new Finder())
78
->in(__DIR__)
@@ -14,6 +15,7 @@
1415
->notName(['_ide_helper*']);
1516

1617
return (new Config())
18+
->setParallelConfig(ParallelConfigFactory::detect())
1719
->setRiskyAllowed(true)
1820
->setFinder($finder)
1921
->setRules([

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN yarn install --frozen-lockfile \
1010

1111
# Stage 1:
1212
# Build the actual container with all of the needed PHP dependencies that will run the application.
13-
FROM --platform=$TARGETOS/$TARGETARCH php:8.2-fpm-alpine
13+
FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
1414
WORKDIR /app
1515
COPY . ./
1616
COPY --from=0 /app/public/assets ./public/assets

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ Stop settling for less. Make game servers a first class citizen on your platform
2727
I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
2828
[Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
2929

30-
| Company | About |
31-
|--------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
32-
| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
33-
| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
34-
| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
35-
| [**HostEZ**](https://hostez.io) | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ! |
36-
| [**Blueprint**](https://blueprint.zip/?pterodactyl=true) | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
37-
| [**indifferent broccoli**](https://indifferentbroccoli.com/) | indifferent broccoli is a game server hosting and rental company. With us, you get top-notch computer power for your gaming sessions. We destroy lag, latency, and complexity--letting you focus on the fun stuff. |
30+
| Company | About |
31+
|-----------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
32+
| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
33+
| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
34+
| [**MineStrator**](https://minestrator.com/) | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try! |
35+
| [**HostEZ**](https://hostez.io) | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ! |
36+
| [**Blueprint**](https://blueprint.zip/?utm_source=pterodactyl&utm_medium=sponsor) | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
37+
| [**indifferent broccoli**](https://indifferentbroccoli.com/) | indifferent broccoli is a game server hosting and rental company. With us, you get top-notch computer power for your gaming sessions. We destroy lag, latency, and complexity--letting you focus on the fun stuff. |
3838

3939
### Supported Games
4040

@@ -63,7 +63,7 @@ and there are plenty more games available provided by the community. Some of the
6363
* Xonotic
6464
* Starmade
6565
* Discord ATLBot, and most other Node.js/Python discord bots
66-
* [and many more...](https://github.com/parkervcp/eggs)
66+
* [and many more...](https://pterodactyleggs.com)
6767

6868
## License
6969

app/Console/Commands/Location/DeleteLocationCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class DeleteLocationCommand extends Command
2020
*/
2121
public function __construct(
2222
private LocationDeletionService $deletionService,
23-
private LocationRepositoryInterface $repository
23+
private LocationRepositoryInterface $repository,
2424
) {
2525
parent::__construct();
2626
}

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function handle()
3636

3737
collect($files)->each(function (\SplFileInfo $file) {
3838
$lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
39-
if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
39+
if ((int) $lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
4040
$this->disk->delete($file->getPath());
4141
$this->info(trans('command/messages.maintenance.deleting_service_backup', ['file' => $file->getFilename()]));
4242
}

app/Console/Commands/Node/NodeConfigurationCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function handle(): int
1717
{
1818
$column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
1919

20-
/** @var \Pterodactyl\Models\Node $node */
20+
/** @var Node $node */
2121
$node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
2222
$this->error('The selected node does not exist.');
2323

app/Console/Commands/Server/BulkPowerActionCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(private DaemonPowerRepository $powerRepository, priv
3030
/**
3131
* Handle the bulk power request.
3232
*
33-
* @throws \Illuminate\Validation\ValidationException
33+
* @throws ValidationException
3434
*/
3535
public function handle()
3636
{

app/Console/Commands/UpgradeCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public function handle()
133133

134134
/** @var \Illuminate\Foundation\Application $app */
135135
$app = require __DIR__ . '/../../../bootstrap/app.php';
136-
/** @var \Pterodactyl\Console\Kernel $kernel */
136+
/** @var Kernel $kernel */
137137
$kernel = $app->make(Kernel::class);
138138
$kernel->bootstrap();
139139
$this->setLaravel($app);

app/Contracts/Extensions/HashidsInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ interface HashidsInterface extends VendorHashidsInterface
1111
*
1212
* @throws \InvalidArgumentException
1313
*/
14-
public function decodeFirst(string $encoded, string $default = null): mixed;
14+
public function decodeFirst(string $encoded, ?string $default = null): mixed;
1515
}

0 commit comments

Comments
 (0)