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

Commit b3ad0da

Browse files
authored
Merge pull request #8 from VectorNetworkProject/analysis-qxoLVa
Apply fixes from StyleCI
2 parents a5c7224 + 525eab7 commit b3ad0da

File tree

10 files changed

+44
-32
lines changed

10 files changed

+44
-32
lines changed

src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public function event(BlockBreakEvent $event)
2929
$block = $event->getBlock();
3030
if (TheEndGameEvent::isFinish()) {
3131
$event->setCancelled();
32+
3233
return;
3334
}
3435
if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) {

src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public function event(BlockPlaceEvent $event)
2121
$player = $event->getPlayer();
2222
if (TheEndGameEvent::isFinish()) {
2323
$event->setCancelled();
24+
2425
return;
2526
}
2627
if ($player->getLevel()->getName() === Server::getInstance()->getDefaultLevel()->getName()) {
@@ -29,7 +30,9 @@ public function event(BlockPlaceEvent $event)
2930
}
3031
$event->setCancelled();
3132
} elseif ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) {
32-
if (DefaultConfig::isDev()) return;
33+
if (DefaultConfig::isDev()) {
34+
return;
35+
}
3336
$event->setCancelled();
3437
}
3538
}

src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,27 @@ public function event(EntityDamageEvent $event)
2424
{
2525
$entity = $event->getEntity();
2626
$entity->extinguish();
27-
if (TheEndGameEvent::isFinish()) return;
28-
if (!$entity instanceof Player) return;
29-
if ($event->getFinalDamage() < $entity->getHealth()) return;
30-
if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) return;
27+
if (TheEndGameEvent::isFinish()) {
28+
return;
29+
}
30+
if (!$entity instanceof Player) {
31+
return;
32+
}
33+
if ($event->getFinalDamage() < $entity->getHealth()) {
34+
return;
35+
}
36+
if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) {
37+
return;
38+
}
3139
if ($event instanceof EntityDamageByEntityEvent) {
3240
$event->setCancelled();
3341
SpawnManager::PlayerReSpawn($entity);
3442
Streak::resetStreak($entity);
3543
$damager = $event->getDamager();
3644
if ($damager instanceof Player) {
37-
if ($entity->getName() === $damager->getName()) return;
45+
if ($entity->getName() === $damager->getName()) {
46+
return;
47+
}
3848
Streak::addStreak($damager);
3949
GoldAPI::addGold($damager, mt_rand(10, 15));
4050
LevelAPI::Auto($damager, mt_rand(10, 15));

src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use InkoHX\GoldLibrary\GoldAPI;
1212
use pocketmine\event\Listener;
13-
use pocketmine\Player;
1413
use pocketmine\Server;
1514
use VectorNetworkProject\TheMix\game\corepvp\blue\BlueTeamManager;
1615
use VectorNetworkProject\TheMix\game\corepvp\red\RedTeamManager;
@@ -33,7 +32,9 @@ public function event(GameWinEvent $event)
3332
}
3433
self::setFinish(true);
3534
foreach (Server::getInstance()->getOnlinePlayers() as $player) {
36-
if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) $player->setFlying(true);
35+
if ($player->getLevel()->getName() === DefaultConfig::getStageLevelName()) {
36+
$player->setFlying(true);
37+
}
3738
$player->getInventory()->clearAll();
3839
if ($event->getType() === GameWinEvent::WIN_RED) {
3940
if (RedTeamManager::isJoined($player)) {

src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace VectorNetworkProject\TheMix\event\game;
1010

11-
1211
use pocketmine\event\Listener;
1312
use pocketmine\Player;
1413
use pocketmine\Server;
@@ -43,7 +42,7 @@ public function event(PlayerStreakEvent $event)
4342

4443
/**
4544
* @param Player $player
46-
* @param int $count
45+
* @param int $count
4746
*/
4847
private function getStreakMessage(Player $player, int $count): void
4948
{

src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace VectorNetworkProject\TheMix\event\level;
1010

11-
1211
use InkoHX\LeveLibrary\event\level\PlayerLevelUpEvent;
1312
use pocketmine\event\Listener;
1413

src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class PlayerStreakEvent extends PlayerEvent implements Cancellable
1616
{
17-
/** @var int $count */
17+
/** @var int $count */
1818
private $count;
1919

2020
public function __construct(Player $player, int $count)

src/VectorNetworkProject/TheMix/game/kit/BlueKit.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace VectorNetworkProject\TheMix\game\kit;
1010

11-
1211
use pocketmine\item\Armor;
1312
use pocketmine\item\Durable;
1413
use pocketmine\item\Item;
@@ -20,17 +19,17 @@ class BlueKit
2019
public static function sendItems(Player $player): void
2120
{
2221
$armors = [
23-
"leather_cap" => Item::get(Item::LEATHER_CAP),
24-
"leather_tunic" => Item::get(Item::LEATHER_TUNIC),
25-
"leather_pants" => Item::get(Item::LEATHER_PANTS),
26-
"leather_boots" => Item::get(Item::LEATHER_BOOTS)
22+
'leather_cap' => Item::get(Item::LEATHER_CAP),
23+
'leather_tunic' => Item::get(Item::LEATHER_TUNIC),
24+
'leather_pants' => Item::get(Item::LEATHER_PANTS),
25+
'leather_boots' => Item::get(Item::LEATHER_BOOTS),
2726
];
2827
$weapons = [
29-
"wooden_sword" => Item::get(Item::WOODEN_SWORD),
30-
"bow" => Item::get(Item::BOW),
31-
"stone_pickaxe" => Item::get(Item::STONE_PICKAXE),
32-
"stone_axe" => Item::get(Item::STONE_AXE),
33-
"stone_shovel" => Item::get(Item::STONE_SHOVEL)
28+
'wooden_sword' => Item::get(Item::WOODEN_SWORD),
29+
'bow' => Item::get(Item::BOW),
30+
'stone_pickaxe' => Item::get(Item::STONE_PICKAXE),
31+
'stone_axe' => Item::get(Item::STONE_AXE),
32+
'stone_shovel' => Item::get(Item::STONE_SHOVEL),
3433
];
3534
foreach ($armors as $armor) {
3635
if ($armor instanceof Durable and $armor instanceof Armor) {

src/VectorNetworkProject/TheMix/game/kit/RedKit.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace VectorNetworkProject\TheMix\game\kit;
1010

11-
1211
use pocketmine\item\Armor;
1312
use pocketmine\item\Durable;
1413
use pocketmine\item\Item;
@@ -20,17 +19,17 @@ class RedKit
2019
public static function sendItem(Player $player)
2120
{
2221
$armors = [
23-
"leather_cap" => Item::get(Item::LEATHER_CAP),
24-
"leather_tunic" => Item::get(Item::LEATHER_TUNIC),
25-
"leather_pants" => Item::get(Item::LEATHER_PANTS),
26-
"leather_boots" => Item::get(Item::LEATHER_BOOTS)
22+
'leather_cap' => Item::get(Item::LEATHER_CAP),
23+
'leather_tunic' => Item::get(Item::LEATHER_TUNIC),
24+
'leather_pants' => Item::get(Item::LEATHER_PANTS),
25+
'leather_boots' => Item::get(Item::LEATHER_BOOTS),
2726
];
2827
$weapons = [
29-
"wooden_sword" => Item::get(Item::WOODEN_SWORD),
30-
"bow" => Item::get(Item::BOW),
31-
"stone_pickaxe" => Item::get(Item::STONE_PICKAXE),
32-
"stone_axe" => Item::get(Item::STONE_AXE),
33-
"stone_shovel" => Item::get(Item::STONE_SHOVEL)
28+
'wooden_sword' => Item::get(Item::WOODEN_SWORD),
29+
'bow' => Item::get(Item::BOW),
30+
'stone_pickaxe' => Item::get(Item::STONE_PICKAXE),
31+
'stone_axe' => Item::get(Item::STONE_AXE),
32+
'stone_shovel' => Item::get(Item::STONE_SHOVEL),
3433
];
3534
foreach ($armors as $armor) {
3635
if ($armor instanceof Durable and $armor instanceof Armor) {

src/VectorNetworkProject/TheMix/game/streak/Streak.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public static function addStreak(Player $player): void
3939

4040
/**
4141
* @param Player $player
42+
*
4243
* @return int
4344
*/
4445
public static function getStreak(Player $player): int

0 commit comments

Comments
 (0)