From d35d9e6ecf5e3955d6c63b8afcd3dde368dd15af Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 13 Nov 2023 15:07:38 +0000
Subject: [PATCH] Enable compression-threads by default

---
 resources/pocketmine.yml                      |  6 +--
 .../mcpe/compression/CompressBatchTask.php    | 54 -------------------
 2 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 src/network/mcpe/compression/CompressBatchTask.php

diff --git a/resources/pocketmine.yml b/resources/pocketmine.yml
index aea32d709..a7a32668c 100644
--- a/resources/pocketmine.yml
+++ b/resources/pocketmine.yml
@@ -85,10 +85,10 @@ network:
   batch-threshold: 256
   #Compression level used when sending batched packets. Higher = more CPU, less bandwidth usage
   compression-level: 6
-  #EXPERIMENTAL! Max threads to use for packet compression. If disabled, compression will be done on the main thread.
+  #Max threads to use for packet compression. If disabled, compression will be done on the main thread.
   #Set to 0 to disable, or "auto" to try to detect the number of available CPU cores.
-  #Higher values will allow using more CPU cores on large servers, but will also increase memory usage.
-  compression-threads: 0
+  #Higher values will allow using more CPU cores, but will also increase memory usage.
+  compression-threads: auto
   #Experimental. Use UPnP to automatically port forward
   upnp-forwarding: false
   #Maximum size in bytes of packets sent over the network (default 1492 bytes). Packets larger than this will be
diff --git a/src/network/mcpe/compression/CompressBatchTask.php b/src/network/mcpe/compression/CompressBatchTask.php
deleted file mode 100644
index 96e9051b6..000000000
--- a/src/network/mcpe/compression/CompressBatchTask.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- *
- *
- */
-
-declare(strict_types=1);
-
-namespace pocketmine\network\mcpe\compression;
-
-use pocketmine\scheduler\AsyncTask;
-use pocketmine\thread\NonThreadSafeValue;
-
-class CompressBatchTask extends AsyncTask{
-
-	private const TLS_KEY_PROMISE = "promise";
-
-	/** @phpstan-var NonThreadSafeValue<Compressor> */
-	private NonThreadSafeValue $compressor;
-
-	public function __construct(
-		private string $data,
-		CompressBatchPromise $promise,
-		Compressor $compressor
-	){
-		$this->compressor = new NonThreadSafeValue($compressor);
-		$this->storeLocal(self::TLS_KEY_PROMISE, $promise);
-	}
-
-	public function onRun() : void{
-		$this->setResult($this->compressor->deserialize()->compress($this->data));
-	}
-
-	public function onCompletion() : void{
-		/** @var CompressBatchPromise $promise */
-		$promise = $this->fetchLocal(self::TLS_KEY_PROMISE);
-		$promise->resolve($this->getResult());
-	}
-}