Skip to content

Commit 4ed4c85

Browse files
committed
a little change
1 parent 193cad3 commit 4ed4c85

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

plugin.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Baton
22
main: Nerahikada\Baton
3-
version: 1.1.0.12
4-
api: [3.0.0, 3.0.0-ALHPA7, 3.0.0-ALHPA8, 3.0.0-ALPHA9, 3.0.0-ALPHA10, 3.0.0-ALPHA11, 3.0.0-ALPHA12]
3+
version: 1.2.0
4+
api: [3.0.0, 4.0.0]
55
load: POSTWORLD
66
author: ねらひかだ
77
description: 警棒プラグイン
8-
website: https://github.com/Nerahikada | https://twitter.com/Nerahikada
8+
website: https://github.com/Nerahikada/Baton
99
commands:
1010
baton:
1111
description: "警棒プラグインのコマンド"

src/Nerahikada/Baton.php

+5-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function onEnable(){
4646
];
4747
}
4848

49-
public function onCommand(CommandSender $sender, Command $command, string $label, array $args): bool{
49+
public function onCommand(CommandSender $sender, Command $command, string $label, array $args) : bool{
5050
if(!$sender->isOp()) return true;
5151
// 可変関数(コールバック関数)
5252
$callable = $this->commandHandler[strtolower(array_shift($args))] ?? $this->commandHandler["help"];
@@ -115,9 +115,7 @@ public function onGiveCommand(CommandSender $sender, array $args){
115115
$item->setCustomName("警棒");
116116

117117
$enchantment = Enchantment::getEnchantment(Enchantment::PROTECTION);
118-
if(strpos((new \ReflectionClass("pocketmine\item\Item"))->getMethod("addEnchantment")->getParameters()[0]->getClass()->getName(), "EnchantmentInstance")){
119-
$enchantment = new \pocketmine\item\enchantment\EnchantmentInstance($enchantment, 1);
120-
}
118+
$enchantment = new \pocketmine\item\enchantment\EnchantmentInstance($enchantment, 1);
121119
$item->addEnchantment($enchantment);
122120

123121
$name = strtolower(implode(" ", $args));
@@ -146,9 +144,9 @@ public function onDamage(EntityDamageEvent $event){
146144
$player = $event->getEntity();
147145
$item = $damager->getInventory()->getItemInHand();
148146
if(
149-
$damager instanceof Player && $player instanceof Player &&
150-
$item->getId() === Item::STICK && $item->hasEnchantments() &&
151-
($damager->isOp() || $this->moderators->exists($damager->getName(), true))
147+
$damager instanceof Player && $player instanceof Player
148+
&& $item->getId() === Item::STICK && $item->hasEnchantments()
149+
&& ($damager->isOp() || $this->moderators->exists($damager->getName(), true))
152150
){
153151
$pos = $this->config->get("pos");
154152
$pos = new Position($pos["x"], $pos["y"] + 0.1, $pos["z"], $this->getServer()->getLevelByName($pos["world"]));

0 commit comments

Comments
 (0)