Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Apply fixes from StyleCI #8

Merged
merged 1 commit into from
Dec 2, 2018
Merged

Apply fixes from StyleCI #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function event(BlockBreakEvent $event)
$block = $event->getBlock();
if (TheEndGameEvent::isFinish()) {
$event->setCancelled();

return;
}
if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) {
Expand Down
5 changes: 4 additions & 1 deletion src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public function event(BlockPlaceEvent $event)
$player = $event->getPlayer();
if (TheEndGameEvent::isFinish()) {
$event->setCancelled();

return;
}
if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) {
Expand All @@ -29,7 +30,9 @@ public function event(BlockPlaceEvent $event)
}
$event->setCancelled();
} elseif ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) {
if (DefaultConfig::isDev()) return;
if (DefaultConfig::isDev()) {
return;
}
$event->setCancelled();
}
}
Expand Down
20 changes: 15 additions & 5 deletions src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,27 @@ public function event(EntityDamageEvent $event)
{
$entity = $event->getEntity();
$entity->extinguish();
if (TheEndGameEvent::isFinish()) return;
if (!$entity instanceof Player) return;
if ($event->getFinalDamage() < $entity->getHealth()) return;
if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) return;
if (TheEndGameEvent::isFinish()) {
return;
}
if (!$entity instanceof Player) {
return;
}
if ($event->getFinalDamage() < $entity->getHealth()) {
return;
}
if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) {
return;
}
if ($event instanceof EntityDamageByEntityEvent) {
$event->setCancelled();
SpawnManager::PlayerReSpawn($entity);
Streak::resetStreak($entity);
$damager = $event->getDamager();
if ($damager instanceof Player) {
if ($entity->getName() === $damager->getName()) return;
if ($entity->getName() === $damager->getName()) {
return;
}
Streak::addStreak($damager);
GoldAPI::addGold($damager, mt_rand(10, 15));
LevelAPI::Auto($damager, mt_rand(10, 15));
Expand Down
5 changes: 3 additions & 2 deletions src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use InkoHX\GoldLibrary\GoldAPI;
use pocketmine\event\Listener;
use pocketmine\Player;
use pocketmine\Server;
use VectorNetworkProject\TheMix\game\corepvp\blue\BlueTeamManager;
use VectorNetworkProject\TheMix\game\corepvp\red\RedTeamManager;
Expand All @@ -33,7 +32,9 @@ public function event(GameWinEvent $event)
}
self::setFinish(true);
foreach (Server::getInstance()->getOnlinePlayers() as $player) {
if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) $player->setFlying(true);
if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) {
$player->setFlying(true);
}
$player->getInventory()->clearAll();
if ($event->getType() === GameWinEvent::WIN_RED) {
if (RedTeamManager::isJoined($player)) {
Expand Down
3 changes: 1 addition & 2 deletions src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace VectorNetworkProject\TheMix\event\game;


use pocketmine\event\Listener;
use pocketmine\Player;
use pocketmine\Server;
Expand Down Expand Up @@ -43,7 +42,7 @@ public function event(PlayerStreakEvent $event)

/**
* @param Player $player
* @param int $count
* @param int $count
*/
private function getStreakMessage(Player $player, int $count): void
{
Expand Down
1 change: 0 additions & 1 deletion src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace VectorNetworkProject\TheMix\event\level;


use InkoHX\LeveLibrary\event\level\PlayerLevelUpEvent;
use pocketmine\event\Listener;

Expand Down
2 changes: 1 addition & 1 deletion src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

class PlayerStreakEvent extends PlayerEvent implements Cancellable
{
/** @var int $count */
/** @var int $count */
private $count;

public function __construct(Player $player, int $count)
Expand Down
19 changes: 9 additions & 10 deletions src/VectorNetworkProject/TheMix/game/kit/BlueKit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace VectorNetworkProject\TheMix\game\kit;


use pocketmine\item\Armor;
use pocketmine\item\Durable;
use pocketmine\item\Item;
Expand All @@ -20,17 +19,17 @@ class BlueKit
public static function sendItems(Player $player): void
{
$armors = [
"leather_cap" => Item::get(Item::LEATHER_CAP),
"leather_tunic" => Item::get(Item::LEATHER_TUNIC),
"leather_pants" => Item::get(Item::LEATHER_PANTS),
"leather_boots" => Item::get(Item::LEATHER_BOOTS)
'leather_cap' => Item::get(Item::LEATHER_CAP),
'leather_tunic' => Item::get(Item::LEATHER_TUNIC),
'leather_pants' => Item::get(Item::LEATHER_PANTS),
'leather_boots' => Item::get(Item::LEATHER_BOOTS),
];
$weapons = [
"wooden_sword" => Item::get(Item::WOODEN_SWORD),
"bow" => Item::get(Item::BOW),
"stone_pickaxe" => Item::get(Item::STONE_PICKAXE),
"stone_axe" => Item::get(Item::STONE_AXE),
"stone_shovel" => Item::get(Item::STONE_SHOVEL)
'wooden_sword' => Item::get(Item::WOODEN_SWORD),
'bow' => Item::get(Item::BOW),
'stone_pickaxe' => Item::get(Item::STONE_PICKAXE),
'stone_axe' => Item::get(Item::STONE_AXE),
'stone_shovel' => Item::get(Item::STONE_SHOVEL),
];
foreach ($armors as $armor) {
if ($armor instanceof Durable and $armor instanceof Armor) {
Expand Down
19 changes: 9 additions & 10 deletions src/VectorNetworkProject/TheMix/game/kit/RedKit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

namespace VectorNetworkProject\TheMix\game\kit;


use pocketmine\item\Armor;
use pocketmine\item\Durable;
use pocketmine\item\Item;
Expand All @@ -20,17 +19,17 @@ class RedKit
public static function sendItem(Player $player)
{
$armors = [
"leather_cap" => Item::get(Item::LEATHER_CAP),
"leather_tunic" => Item::get(Item::LEATHER_TUNIC),
"leather_pants" => Item::get(Item::LEATHER_PANTS),
"leather_boots" => Item::get(Item::LEATHER_BOOTS)
'leather_cap' => Item::get(Item::LEATHER_CAP),
'leather_tunic' => Item::get(Item::LEATHER_TUNIC),
'leather_pants' => Item::get(Item::LEATHER_PANTS),
'leather_boots' => Item::get(Item::LEATHER_BOOTS),
];
$weapons = [
"wooden_sword" => Item::get(Item::WOODEN_SWORD),
"bow" => Item::get(Item::BOW),
"stone_pickaxe" => Item::get(Item::STONE_PICKAXE),
"stone_axe" => Item::get(Item::STONE_AXE),
"stone_shovel" => Item::get(Item::STONE_SHOVEL)
'wooden_sword' => Item::get(Item::WOODEN_SWORD),
'bow' => Item::get(Item::BOW),
'stone_pickaxe' => Item::get(Item::STONE_PICKAXE),
'stone_axe' => Item::get(Item::STONE_AXE),
'stone_shovel' => Item::get(Item::STONE_SHOVEL),
];
foreach ($armors as $armor) {
if ($armor instanceof Durable and $armor instanceof Armor) {
Expand Down
1 change: 1 addition & 0 deletions src/VectorNetworkProject/TheMix/game/streak/Streak.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public static function addStreak(Player $player): void

/**
* @param Player $player
*
* @return int
*/
public static function getStreak(Player $player): int
Expand Down