Merge pull request #23 from Nlkomaru/feature/delete-owner

Added delete horse owner command.
RaceAssist · Jul 2, 2022 · 7df714c · 7df714c
2 parents 171f7b5 + f9c3c7e
commit 7df714c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt b/src/main/kotlin/dev/nikomaru/raceassist/RaceAssist.kt
@@ -29,7 +29,8 @@ import dev.nikomaru.raceassist.bet.commands.*
 import dev.nikomaru.raceassist.bet.event.BetGuiClickEvent
 import dev.nikomaru.raceassist.data.database.BetList
 import dev.nikomaru.raceassist.files.Config
-import dev.nikomaru.raceassist.horse.event.HorseBreedEvent
+import dev.nikomaru.raceassist.horse.commands.OwnerDeleteCommand
+import dev.nikomaru.raceassist.horse.events.HorseBreedEvent
 import dev.nikomaru.raceassist.race.commands.HelpCommand
 import dev.nikomaru.raceassist.race.commands.audience.*
 import dev.nikomaru.raceassist.race.commands.place.*
@@ -128,6 +129,8 @@ class RaceAssist : SuspendingJavaPlugin() {
         annotationParser.parse(SettingStaffCommand())
 
         annotationParser.parse(HelpCommand())
+
+        annotationParser.parse(OwnerDeleteCommand())
     }
 
     private fun registerEvents() {

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/horse/commands/OwnerDeleteCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/horse/commands/OwnerDeleteCommand.kt
@@ -0,0 +1,45 @@
+/*
+ *     Copyright © 2021-2022 Nikomaru <[email protected]>
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.nikomaru.raceassist.horse.commands
+
+import cloud.commandframework.annotations.CommandMethod
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Horse
+import org.bukkit.entity.Player
+
+@CommandMethod("ra horse")
+class OwnerDeleteCommand {
+    @CommandMethod("ownerDelete")
+    fun removeOwner(sender: CommandSender) {
+        if (sender !is Player) {
+            sender.sendMessage("このコマンドはプレイヤーのみ実行できます")
+            return
+        }
+        val entity = sender.getTargetEntity(5) ?: return sender.sendMessage("対象が見つかりませんでした")
+        if (entity !is Horse) {
+            sender.sendMessage("対象が馬ではありません")
+            return
+        }
+        if (entity.owner != sender) {
+            sender.sendMessage("あなたはこの馬のオーナーではありません")
+            return
+        }
+        entity.owner = null
+        sender.sendMessage("オーナーを解除しました")
+    }
+}
diff --git a/...raceassist/horse/event/HorseBreedEvent.kt → ...aceassist/horse/events/HorseBreedEvent.kt b/...raceassist/horse/event/HorseBreedEvent.kt → ...aceassist/horse/events/HorseBreedEvent.kt
@@ -15,7 +15,7 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package dev.nikomaru.raceassist.horse.event
+package dev.nikomaru.raceassist.horse.events
 
 import dev.nikomaru.raceassist.horse.utlis.HorseUtils.getCalcJump
 import dev.nikomaru.raceassist.horse.utlis.HorseUtils.getCalcSpeed