From 0772bd56b899f543e8b543c5e56a90103d40b5ec Mon Sep 17 00:00:00 2001 From: root Date: Tue, 12 Jul 2016 19:17:19 +0300 Subject: [PATCH] Upload --- README.md | 12 +++++- plugin.yml | 18 ++++---- .../SynapseTransfer}/PlayerTransferEvent.php | 42 ++++++------------- .../SynapseTransfer/SynapseTransfer.php} | 11 +++-- 4 files changed, 39 insertions(+), 44 deletions(-) rename src/{shoghicp/FastTransfer => MrGenga/SynapseTransfer}/PlayerTransferEvent.php (62%) rename src/{shoghicp/FastTransfer/FastTransfer.php => MrGenga/SynapseTransfer/SynapseTransfer.php} (93%) diff --git a/README.md b/README.md index 1b0edc5..7eedfd7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ -# FastTransfer -Edited for PocketMine-MP 1.6 version of FastTransfer plugin. +# SynapseTransfer +Edit of FastTransfer, for working with [Synapse](https://github.com/iTXTech/Synapse) by [iTXTech](https://github.com/iTXTech). [Original plugin](https://github.com/shoghicp/FastTransfer) made by [shoghicp](https://github.com/shoghicp). +# Commands +```/transfer [player] ``` - Transfer SynapsePlayer to other server. Servers can be setting in config.yml. +# Permissions +```synapsetransfer.command.transfer``` - Allow to use ```/transfer``` command. Default for op. +# API +```SynapseTransfer::transfer(Player $player, string $server, string $message)``` - Transfer SynapsePlayer to other SynapseClient. Example: ```$this->getServer()->getPluginManager()->getPlugin("SynapseTransfer")->transfer($player, "hub", ""); ``` +# Phar +Coming soon... diff --git a/plugin.yml b/plugin.yml index 59645ec..c38fcfa 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,16 +1,16 @@ -name: FastTransfer -version: 1.0.3 +name: SynapseTransfer +version: 1.0.0 api: 1.13.0 -main: shoghicp\FastTransfer\FastTransfer +main: MrGenga\SynapseTransfer\SynapseTransfer load: STARTUP -author: shoghicp -website: "https://github.com/shoghicp/FastTransfer" -description: "Transfer vanilla Minecraft: PE clients to another server" +author: MrGenga +website: "https://github.com/MrGenga/SynapseTransfer" +description: "Transfer Minecraft: PE clients connected by Synapse to another server" commands: transfer: - permission: fasttransfer.command.transfer - usage: "/transfer [player]
" + permission: synapsetransfer.command.transfer + usage: "/transfer [player] " permissions: - fasttransfer.command.transfer: + synapsetransfer.command.transfer: description: "Allows to transfer players to another server" default: op diff --git a/src/shoghicp/FastTransfer/PlayerTransferEvent.php b/src/MrGenga/SynapseTransfer/PlayerTransferEvent.php similarity index 62% rename from src/shoghicp/FastTransfer/PlayerTransferEvent.php rename to src/MrGenga/SynapseTransfer/PlayerTransferEvent.php index fa78786..934a200 100644 --- a/src/shoghicp/FastTransfer/PlayerTransferEvent.php +++ b/src/MrGenga/SynapseTransfer/PlayerTransferEvent.php @@ -1,8 +1,8 @@ + * SynapseTransfer plugin for Genisys + * Copyright (C) 2016 Raul Vakhitov * * 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 @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -namespace shoghicp\FastTransfer; +namespace MrGenga\SynapseTransfer; use pocketmine\event\Cancellable; use pocketmine\event\player\PlayerEvent; @@ -25,52 +25,34 @@ class PlayerTransferEvent extends PlayerEvent implements Cancellable{ public static $handlerList = null; /** @var string */ - private $address; - /** @var int */ - private $port; + private $serverName; /** @var string */ private $message; /** * @param Player $player - * @param string $address - * @param int $port + * @param string $server * @param string $message */ - public function __construct(Player $player, $address, $port = 19132, $message = ""){ + public function __construct(Player $player, $server, $message = ""){ $this->player = $player; - $this->address = $address; - $this->port = (int) $port; + $this->serverName = $server; $this->message = $message; } - /** - * @return int - */ - public function getPort(){ - return $this->port; - } - /** * @return string */ - public function getAddress(){ - return $this->address; - } - - /** - * @param int $port - */ - public function setPort($port){ - $this->port = (int) $port; + public function getServerName(){ + return $this->serverName; } /** - * @param string $address + * @param string $server */ - public function setAddress($address){ - $this->address = $address; + public function setServerName($server){ + $this->serverName = $server; } public function getMessage(){ diff --git a/src/shoghicp/FastTransfer/FastTransfer.php b/src/MrGenga/SynapseTransfer/SynapseTransfer.php similarity index 93% rename from src/shoghicp/FastTransfer/FastTransfer.php rename to src/MrGenga/SynapseTransfer/SynapseTransfer.php index 8b0e822..4ad6ecc 100644 --- a/src/shoghicp/FastTransfer/FastTransfer.php +++ b/src/MrGenga/SynapseTransfer/SynapseTransfer.php @@ -23,6 +23,7 @@ use pocketmine\Player; use pocketmine\plugin\PluginBase; use pocketmine\utils\TextFormat; +use pocketmine\utils\Config; use synapse\Player as SynapsePlayer; @@ -114,6 +115,9 @@ public function transferPlayer(Player $player, $server, $message = "You are bein if($ev->isCancelled()){ return false; } + $message = $ev->getMessage(); + $server = $ev->getServerName(); + $player = $ev->getPlayer(); if($message !== null and $message !== ""){ $player->sendMessage($message); @@ -125,13 +129,14 @@ public function transferPlayer(Player $player, $server, $message = "You are bein return false; } if(($hash = $this->getClientHashByDescription($des)) != null){ - if($des == $sender->getServer()->getSynapse()->getDescription()){ + if($des == $player->getServer()->getSynapse()->getDescription()){ $this->getLogger()->warn(TextFormat::RED . "Cannot transfer to the current server"); return false; } $player->transfer($hash); }else{ $this->getLogger()->warn(TextFormat::RED . "$server is not a SynapseClient"); + return false; } return true; @@ -166,13 +171,13 @@ public function onCommand(CommandSender $sender, Command $command, $label, array $sender->sendMessage(TextFormat::RED . "Undefined SynapseClient $server"); return true; } - if($target instanseof SynapsePlayer && ($hash = $this->getClientHashByDescription($des)) != null){ + if($target instanceof SynapsePlayer && ($hash = $this->getClientHashByDescription($des)) != null){ if($des == $sender->getServer()->getSynapse()->getDescription()){ $sender->sendMessage(TextFormat::RED . "Cannot transfer to the current server"); return true; } }else{ - $sender->sendMessage(TextFormat::RED . $target->getName() + " is not a SynapsePlayer or $server is not a SynapseClient"); + $sender->sendMessage(TextFormat::RED . $target->getName() . " is not a SynapsePlayer or $server is not a SynapseClient"); return true; }