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

Commit 6a60ab1

Browse files
committed
Fix AutoRespawn
1 parent e9cfc1c commit 6a60ab1

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

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

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

99
namespace VectorNetworkProject\TheMix\event\entity;
1010

11+
use InkoHX\GoldLibrary\GoldAPI;
12+
use InkoHX\LeveLibrary\LevelAPI;
13+
use pocketmine\event\entity\EntityDamageByEntityEvent;
1114
use pocketmine\event\entity\EntityDamageEvent;
1215
use pocketmine\event\Listener;
1316
use pocketmine\Player;
@@ -21,23 +24,25 @@ public function event(EntityDamageEvent $event)
2124
{
2225
$entity = $event->getEntity();
2326
$entity->extinguish();
24-
if (TheEndGameEvent::isFinish()) {
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;
31+
if ($event instanceof EntityDamageByEntityEvent) {
2532
$event->setCancelled();
26-
return;
27-
}
28-
if (!$entity instanceof Player) {
29-
return;
30-
}
31-
if ($event->getFinalDamage() <= $entity->getHealth()) {
32-
return;
33-
}
34-
if ($event->getCause() === EntityDamageEvent::CAUSE_FALL) {
33+
SpawnManager::PlayerReSpawn($entity);
34+
Streak::resetStreak($entity);
35+
$damager = $event->getDamager();
36+
if ($damager instanceof Player) {
37+
if ($entity->getName() === $damager->getName()) return;
38+
Streak::addStreak($damager);
39+
GoldAPI::addGold($damager, mt_rand(10, 15));
40+
LevelAPI::Auto($damager, mt_rand(10, 15));
41+
}
42+
} else {
3543
$event->setCancelled();
36-
37-
return;
44+
Streak::resetStreak($entity);
45+
SpawnManager::PlayerReSpawn($entity);
3846
}
39-
$event->setCancelled();
40-
Streak::resetStreak($entity);
41-
SpawnManager::PlayerReSpawn($entity);
4247
}
4348
}

0 commit comments

Comments
 (0)