From 262bdc467dca53c95da04ab8518bd1dc1298b7f2 Mon Sep 17 00:00:00 2001 From: Joshua Castle <26531652+Kas-tle@users.noreply.github.com> Date: Mon, 12 Dec 2022 22:34:19 -0800 Subject: [PATCH] Disable mhat for now as running it bricks server --- .github/workflows/maven.yml | 2 +- .../bukkit/items/models/ModelCommands.java | 22 +++++++++---------- plugin/pom.xml | 1 - pom.xml | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 93f0d54..2864b44 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,7 +51,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SNW_VERSION: ${{ steps.lookupParadisuVersion.outputs.result }} run: mvn -Drevision=${SNW_VERSION} clean package - - run: mkdir staging && cp target/ParadisuPlugin.jar staging + - run: mkdir staging && cp plugin/target/ParadisuPlugin.jar staging - uses: actions/upload-artifact@v2 with: name: ParadisuPlugin-Latest diff --git a/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java index 55e66c5..a7321a6 100644 --- a/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java @@ -94,15 +94,15 @@ public void hGiveModelPlayer(CommandSender sender, sender.sendMessage(cmdprefix + "§fWe gave them the model " + cmdemph + "#" + model + "§f!"); } - @CommandPermission("paradisu.mhat") - @CommandMethod("mhat") - public void mHat(CommandSender sender){ - Player player = (Player) sender; - ItemStack[] armor = player.getInventory().getArmorContents(); - ItemStack swap = armor[3]; - armor[3] = player.getEquipment().getItemInMainHand(); - player.getInventory().setArmorContents(armor); - player.getInventory().setItemInMainHand(swap); - player.sendMessage(cmdprefix + "§fWe set the model as your helmet."); - } + // @CommandPermission("paradisu.mhat") + // @CommandMethod("mhat") + // public void mHat(CommandSender sender){ + // Player player = (Player) sender; + // ItemStack[] armor = player.getInventory().getArmorContents(); + // ItemStack swap = armor[3]; + // armor[3] = player.getEquipment().getItemInMainHand(); + // player.getInventory().setArmorContents(armor); + // player.getInventory().setItemInMainHand(swap); + // player.sendMessage(cmdprefix + "§fWe set the model as your helmet."); + // } } diff --git a/plugin/pom.xml b/plugin/pom.xml index 2029fbe..28ab281 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -28,7 +28,6 @@ - ../target ${plugin.name} diff --git a/pom.xml b/pom.xml index a7a10dd..0b45f75 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ParadisuPlugin UTF-8 - 3.4.2 + 3.4.3 17 17 1.2-SNAPSHOT