From ace5616198e2a9fd0c4110615e7139d8e6018cb7 Mon Sep 17 00:00:00 2001
From: llex_tv <122151499+llextv@users.noreply.github.com>
Date: Fri, 9 Aug 2024 10:58:18 +0200
Subject: [PATCH 1/2] Update ProutCommand.java - Casser le bateau lors du
 /prout

---
 .../core/commands/fun/ProutCommand.java       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java b/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
index bbecbd55..dffad1cb 100644
--- a/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
+++ b/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
@@ -5,6 +5,7 @@
 import fr.communaywen.core.credit.Feature;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.scoreboard.Scoreboard;
@@ -15,6 +16,7 @@
 import revxrsal.commands.annotation.Cooldown;
 import revxrsal.commands.annotation.Description;
 import revxrsal.commands.bukkit.annotation.CommandPermission;
+import org.bukkit.entity.Boat;
 
 import java.util.concurrent.TimeUnit;
 
@@ -35,6 +37,18 @@ public final class ProutCommand {
     public void onCommand(Player player) {
         player.sendMessage("§2Beuuurk, ça pue !");
 
+        if(player.isInsideVehicle()){
+            if(player.getVehicle() instanceof Boat){
+                Boat boat = (Boat) player.getVehicle();
+                Material boatMaterial = getBoatType(boat);
+                ItemStack itemBoat = new ItemStack(boatMaterial);
+                player.getVehicle().remove();
+                player.getWorld().dropItemNaturally(player.getLocation(), itemBoat);
+
+                player.sendMessage("Votre bateau a coulé.");
+            }
+        }
+
         // Make the player jump
         final Vector currentVelocity = player.getVelocity();
         currentVelocity.setY(0.55d);
@@ -78,4 +92,19 @@ private void addGlowingEffect(Player player) {
 
         Bukkit.getScheduler().runTaskLater(AywenCraftPlugin.getInstance(), () -> finalTeam.removeEntry(player.getName()), 600L);
     }
+
+    private Material getBoatType(Boat boat){
+        switch(boat.getBoatType()){
+            case OAK -> {return Material.OAK_BOAT;}
+            case BIRCH -> {return Material.BIRCH_BOAT;}
+            case ACACIA -> {return Material.ACACIA_BOAT;}
+            case BAMBOO -> {return Material.BAMBOO_RAFT;}
+            case CHERRY -> {return Material.CHERRY_BOAT;}
+            case JUNGLE -> {return Material.JUNGLE_BOAT;}
+            case SPRUCE -> {return Material.SPRUCE_BOAT;}
+            case DARK_OAK -> {return Material.DARK_OAK_BOAT;}
+            case MANGROVE -> {return  Material.MANGROVE_BOAT;}
+            default -> {return Material.OAK_BOAT;}
+        }
+    }
 }

From 2818c6dd6bab52590d935e2d0ef0401ac7f3aa25 Mon Sep 17 00:00:00 2001
From: llex_tv <122151499+llextv@users.noreply.github.com>
Date: Sat, 10 Aug 2024 13:25:38 +0200
Subject: [PATCH 2/2] Update ProutCommand.java

---
 .../java/fr/communaywen/core/commands/fun/ProutCommand.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java b/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
index dffad1cb..e5ed82b6 100644
--- a/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
+++ b/src/main/java/fr/communaywen/core/commands/fun/ProutCommand.java
@@ -43,7 +43,7 @@ public void onCommand(Player player) {
                 Material boatMaterial = getBoatType(boat);
                 ItemStack itemBoat = new ItemStack(boatMaterial);
                 player.getVehicle().remove();
-                player.getWorld().dropItemNaturally(player.getLocation(), itemBoat);
+                player.getWorld().dropItemNaturally(boat.getLocation(), itemBoat);
 
                 player.sendMessage("Votre bateau a coulé.");
             }