Skip to content

Commit

Permalink
slight modification
Browse files Browse the repository at this point in the history
  • Loading branch information
brokiem committed Aug 12, 2022
1 parent f39bede commit 5d32c9c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions src/AkmalFairuz/BedrockTCP/BedrockTCP.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
use AkmalFairuz\BedrockTCP\network\TCPNetworkSession;
use AkmalFairuz\BedrockTCP\network\TCPServerManager;
use AkmalFairuz\BedrockTCP\network\TCPSession;
use AkmalFairuz\BedrockTCP\packet\NSL;
use AkmalFairuz\BedrockTCP\packet\CustomNetworkStackLatency;
use pocketmine\event\Listener;
use pocketmine\event\server\DataPacketReceiveEvent;
use pocketmine\event\server\NetworkInterfaceRegisterEvent;
use pocketmine\network\mcpe\protocol\PacketPool;
use pocketmine\network\mcpe\protocol\TickSyncPacket;
use pocketmine\network\mcpe\raklib\RakLibInterface;
use pocketmine\plugin\PluginBase;
use pocketmine\Server;
use function function_exists;

class BedrockTCP extends PluginBase implements Listener{

Expand All @@ -29,16 +29,16 @@ public function onEnable(): void{
$port = Server::getInstance()->getPort();
$this->getServer()->getNetwork()->registerInterface(new TCPServerManager($this, $this->getServer(), $this->getServer()->getNetwork(), $ip, $port, TCPSession::class));
$this->getServer()->getPluginManager()->registerEvents($this, $this);
PacketPool::getInstance()->registerPacket(new NSL());
PacketPool::getInstance()->registerPacket(new CustomNetworkStackLatency());
}

/**
* @param NetworkInterfaceRegisterEvent $event
* @priority HIGHEST
*/
public function onNetworkInterfaceRegister(NetworkInterfaceRegisterEvent $event) {
public function onNetworkInterfaceRegister(NetworkInterfaceRegisterEvent $event): void {
$interface = $event->getInterface();
if(!$interface instanceof TCPServerManager) {
if($interface instanceof RakLibInterface) {
$event->cancel();
}
}
Expand All @@ -48,11 +48,11 @@ public function onNetworkInterfaceRegister(NetworkInterfaceRegisterEvent $event)
* @priority LOWEST
* @ignoreCancelled true
*/
public function onDataPacketReceive(DataPacketReceiveEvent $event) {
public function onDataPacketReceive(DataPacketReceiveEvent $event): void {
$packet = $event->getPacket();
/** @var TCPNetworkSession $origin */
$origin = $event->getOrigin();
if($packet instanceof NSL) {
if($packet instanceof CustomNetworkStackLatency) {
if($packet->timestamp === 0 && $packet->needResponse) {
$origin->sendDataPacket($packet, true);
$event->cancel();
Expand Down
4 changes: 2 additions & 2 deletions src/AkmalFairuz/BedrockTCP/compressor/TCPCompressor.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

class TCPCompressor implements Compressor{

const COMPRESSION_LEVEL = 2;
public const COMPRESSION_LEVEL = 2;

use SingletonTrait;

Expand All @@ -38,7 +38,7 @@ public function willCompress(string $data): bool{
}

public function decompress(string $payload): string{
$compressAlgo = substr($payload, 0, 1);
$compressAlgo = $payload[0];
$payload = substr($payload, 1);
if($compressAlgo === "\x00") {
$result = @zlib_decode($payload);
Expand Down
2 changes: 1 addition & 1 deletion src/AkmalFairuz/BedrockTCP/network/TCPNetworkSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function getUpstreamPing(): int{
}

public function getPing(): int{
return $this->downstreamPing;
return $this->upstreamPing;
}

public function getTotalPing(): int{
Expand Down
2 changes: 1 addition & 1 deletion src/AkmalFairuz/BedrockTCP/network/TCPSession.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function onConnect(): void{
public function handlePacket(string $packet): void{
$this->pendingBuffer .= $packet;

while(strlen($this->pendingBuffer) > 0){
while('' !== $this->pendingBuffer){
$frameLength = Binary::readInt(substr($this->pendingBuffer, 0, 4));
$payload = substr($this->pendingBuffer, 4, $frameLength);
if($frameLength !== strlen($payload)){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use pocketmine\network\mcpe\protocol\NetworkStackLatencyPacket;

class NSL extends NetworkStackLatencyPacket{
class CustomNetworkStackLatency extends NetworkStackLatencyPacket{

public function canBeSentBeforeLogin(): bool{
return true;
Expand Down

0 comments on commit 5d32c9c

Please sign in to comment.