Ad5001/FastTravel
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing about 2000 bugs

Browse source
This commit is contained in:
Ad5001 2017-02-03 21:18:48 +01:00
parent db0a593baa
commit 032775f0a8
4 changed files with 87 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/config.yml
View file

@ -12,7 +12,7 @@
#
# Put here the block you want to be an elevetor.
ElevatorBlock: cobblestone_wall
ElevatorBlock: note_block
SpeedBlock: ice
...

45
src/Ad5001/FastTravel/Main.php
View file

@ -46,6 +46,7 @@ class Main extends PluginBase implements Listener {
protected $elevator;
protected $speed;
public $cancelUpAfterDown = [];
@ -83,19 +84,20 @@ class Main extends PluginBase implements Listener {
@return void
*/
public function onPlayerSneak(PlayerToggleSneakEvent $event) {
$b = $event->getPlayer()->getLevel()->getBlock(new \pocketmine\math\Vector3(round($player->x), round($player->y - 1), $player->z));
$b = $event->getPlayer()->getLevel()->getBlock(new \pocketmine\math\Vector3(round($event->getPlayer()->x), floor($event->getPlayer()->y - 1), round($event->getPlayer()->z)));
if($b->getId() == $this->elevator->getId() && $b->getDamage() == $this->elevator->getDamage() && $event->isSneaking()) { // Checking if the player is sneaking on the block set as elevator.
$bl = $this->getBlocksUnder($b);
$bl = $this->getBlockUnder($b);
if(!is_null($bl) && !$this->hasFreeSpace($bl)) {
while(!is_null($bl) && !$this->hasFreeSpace($bl)) {
$bl = $this->getBlocksUnder($bl);
$bl = $this->getBlockUnder($bl);
}
}
if(!is_null($bl)) { // A elevator under exists
$event->getPlayer()->teleport(new \pocketmine\math\Vector3($bl->x, $bl->y + 1, $bl->z));
// $this->getLogger()->debug("Down " . $bl->y);
$event->getPlayer()->teleport(new \pocketmine\math\Vector3($bl->x, $bl->y + 1.5, $bl->z));
$this->setCooldown($event->getPlayer());
$event->getPlayer()->getLevel()->addSound(new \pocketmine\level\sound\EndermanTeleportSound($event->getPlayer()));
}
$event->setCancelled();
}
}
@ -105,16 +107,19 @@ class Main extends PluginBase implements Listener {
@return void
*/
public function onPlayerMove(PlayerMoveEvent $event) {
$b = $event->getPlayer()->getLevel()->getBlock(new \pocketmine\math\Vector3(round($player->x), round($player->y - 1), $player->z));
$b = $event->getPlayer()->getLevel()->getBlock(new \pocketmine\math\Vector3(round($event->getFrom()->x), floor($event->getFrom()->y - 1), round($event->getFrom()->z)));
if($b->getId() == $this->elevator->getId() && $b->getDamage() == $this->elevator->getDamage() && $event->getTo()->y > $event->getFrom()->y) { // Checking if the player is sneaking on the block set as elevator.
$bl = $this->getBlocksAbove($b);
$this->getLogger()->debug($event->getFrom() . "/" . $event->getTo());
$bl = $this->getBlockAbove($b);
if(!is_null($bl) && !$this->hasFreeSpace($bl)) {
while(!is_null($bl) && !$this->hasFreeSpace($bl)) {
$bl = $this->getBlocksAbove($bl);
$bl = $this->getBlockAbove($bl);
}
}
if(!is_null($bl)) { // A elevator above exists
$event->setTo(new \pocketmine\math\Vector3($bl->x, $bl->y + 1, $bl->z));
if(!is_null($bl) && !isset($this->cancelUpAfterDown[$event->getPlayer()->getName()])) { // A elevator above exists
// $this->getLogger()->debug("Up" . $bl->y);
$event->setTo(new \pocketmine\level\Location($bl->x, $bl->y + 1.5, $bl->z));
$this->setCooldown($event->getPlayer());
$event->getPlayer()->getLevel()->addSound(new \pocketmine\level\sound\EndermanTeleportSound($event->getPlayer()));
}
}
@ -139,7 +144,7 @@ class Main extends PluginBase implements Listener {
public function getBlockUnder(\pocketmine\block\Block $b) {
for($i = $b->y - 2/* TP atleast under two blocks of the current one*/; $i > 0; $i--) {
$block = $b->getLevel()->getBlock(new \pocketmine\math\Vector3($b->x, $i, $b->z));
if($block->geId() == $b->getId() && $block->getDamage() == $block->getDamage()) return $block;
if($block->getId() == $b->getId() && $block->getDamage() == $block->getDamage()) return $block;
}
return null;
}
@ -154,7 +159,7 @@ class Main extends PluginBase implements Listener {
public function getBlockAbove(\pocketmine\block\Block $b) {
for($i = $b->y + 2/* TP atleast above two blocks of the current one*/; $i < 128; $i++) {
$block = $b->getLevel()->getBlock(new \pocketmine\math\Vector3($b->x, $i, $b->z));
if($block->geId() == $b->getId() && $block->getDamage() == $block->getDamage()) return $block;
if($block->getId() == $b->getId() && $block->getDamage() == $block->getDamage()) return $block;
}
return null;
}
@ -175,7 +180,6 @@ class Main extends PluginBase implements Listener {
/*
Return a clone of the elevator block
@param
@return \pocketmine\block\Block
*/
public function getElevatorBlock() : \pocketmine\block\Block {
@ -185,12 +189,23 @@ class Main extends PluginBase implements Listener {
/*
Return a clone of the speeding block
@param
@return \pocketmine\block\Block
*/
public function getSpeed() : \pocketmine\block\Block {
public function getSpeedBlock() : \pocketmine\block\Block {
return clone $this->speed;
}
/*
Sets a cooldown of using the up & down blocks to a player
@param $player Player
@return void
*/
public function setCooldown(Player $player) {
$this->cancelUpAfterDown[$player->getName()] = true;
$this->getServer()->getScheduler()->scheduleDelayedTask(new tasks\UpCooldownTask($this, $player), 20);
}
}

4
src/Ad5001/FastTravel/tasks/FastingTask.php
View file

@ -18,7 +18,7 @@ namespace Ad5001\FastTravel\tasks;
use pocketmine\Server;
use pocketmine\schedulerPluginTask;
use pocketmine\scheduler\PluginTask;
use pocketmine\Player;
@ -44,7 +44,7 @@ class FastingTask extends PluginTask {
public function onRun($tick) {
foreach($this->server->getPlayers() as $p) {
foreach($this->server->getOnlinePlayers() as $p) {
}
}

54
src/Ad5001/FastTravel/tasks/UpCooldownTask.php Normal file
View file

@ -0,0 +1,54 @@
<?php
/*
_____ _ _____ _
| ___| __ _ ___ | |_ |_ _| _ __ __ _ __ __ ___ | |
| |_ / _` | / __| | __| | | | '__| / _` | \ \ / / / _ \ | |
| _| | (_| | \__ \ | |_ | | | | | (_| | \ V / | __/ | |
|_| \__,_| |___/ \__| |_| |_| \__,_| \_/ \___| |_|
Travel in MCPE faster and easier than you ever tought !
@author Ad5001
@link http://github.com/Ad5001/FastTravel
*/
namespace Ad5001\FastTravel\tasks;
use pocketmine\Server;
use pocketmine\scheduler\PluginTask;
use pocketmine\Player;
use Ad5001\FastTravel\Main;
class UpCooldownTask extends PluginTask {
public function __construct(Main $main, Player $player) {
parent::__construct($main);
$this->main = $main;
$this->player = $player->getName();
$this->server = $main->getServer();
}
public function onRun($tick) {
unset($this->main->cancelUpAfterDown[$this->player]);
}
}