Disable mhat for now as running it bricks server

Paradisu · Dec 13, 2022 · 262bdc4 · 262bdc4
1 parent bbbfc9a
commit 262bdc4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git 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
@@ -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
@@ -28,7 +28,6 @@
     </dependencies>
 
     <build>
-        <directory>../target</directory>
         <finalName>${plugin.name}</finalName>
         <resources>
             <resource>

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <plugin.name>ParadisuPlugin</plugin.name>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <minecraft.plugin.version>3.4.2</minecraft.plugin.version>
+        <minecraft.plugin.version>3.4.3</minecraft.plugin.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <dependency.connectorplugin.version>1.2-SNAPSHOT</dependency.connectorplugin.version>