mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-24 03:44:08 +00:00
Code Issues Projects Releases Wiki Activity

KillCommand: clean up old shitcode

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-20 19:44:41 +01:00
parent dbaf7287bc
commit eccc249009
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/command/defaults/KillCommand.php
View File

@ -62,15 +62,7 @@ class KillCommand extends VanillaCommand{
$player = $sender->getServer()->getPlayer($args[0]); $player = $sender->getServer()->getPlayer($args[0]);
if($player instanceof Player){ if($player instanceof Player){
$sender->getServer()->getPluginManager()->callEvent($ev = new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000)); $player->attack(new EntityDamageEvent($player, EntityDamageEvent::CAUSE_SUICIDE, 1000));
if($ev->isCancelled()){
return true;
}
$player->setLastDamageCause($ev);
$player->setHealth(0);
Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kill.successful", [$player->getName()])); Command::broadcastCommandMessage($sender, new TranslationContainer("commands.kill.successful", [$player->getName()]));
}else{ }else{
$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
@ -86,14 +78,7 @@ class KillCommand extends VanillaCommand{
return true; return true;
} }
$sender->getServer()->getPluginManager()->callEvent($ev = new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000)); $sender->attack(new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000));
if($ev->isCancelled()){
return true;
}
$sender->setLastDamageCause($ev);
$sender->setHealth(0);
$sender->sendMessage(new TranslationContainer("commands.kill.successful", [$sender->getName()])); $sender->sendMessage(new TranslationContainer("commands.kill.successful", [$sender->getName()]));
}else{ }else{
throw new InvalidCommandSyntaxException(); throw new InvalidCommandSyntaxException();