Merge branch 'master' into update

ArmaRealms · Oct 25, 2024 · 9943e47 · 9943e47
2 parents 23b0272 + 571013c
commit 9943e47
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/gmail/nossr50/events/McMMOReplaceVanillaTreasureEvent.java b/src/main/java/com/gmail/nossr50/events/McMMOReplaceVanillaTreasureEvent.java
@@ -1,18 +1,26 @@
 package com.gmail.nossr50.events;
 
 import org.bukkit.entity.Item;
+import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public class McMMOReplaceVanillaTreasureEvent extends Event {
     private @NotNull ItemStack replacementItemStack;
     private final @NotNull Item originalItem;
+    private final @Nullable Player causingPlayer;
 
     public McMMOReplaceVanillaTreasureEvent(@NotNull Item originalItem, @NotNull ItemStack replacementItemStack) {
+        this(originalItem, replacementItemStack, null);
+    }
+
+    public McMMOReplaceVanillaTreasureEvent(@NotNull Item originalItem, @NotNull ItemStack replacementItemStack, @Nullable Player causingPlayer) {
         this.originalItem = originalItem;
         this.replacementItemStack = replacementItemStack;
+        this.causingPlayer = causingPlayer;
     }
 
     /** Rest of file is required boilerplate for custom events **/
@@ -31,6 +39,10 @@ public McMMOReplaceVanillaTreasureEvent(@NotNull Item originalItem, @NotNull Ite
         return replacementItemStack;
     }
 
+    public @Nullable Player getCausingPlayer() {
+        return causingPlayer;
+    }
+
     public void setReplacementItemStack(@NotNull ItemStack replacementItemStack) {
         this.replacementItemStack = replacementItemStack;
     }

diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -312,7 +312,7 @@ public void onPlayerFishHighest(PlayerFishEvent event) {
 
                         ItemStack replacementCatch = new ItemStack(Material.SALMON, 1);
 
-                        McMMOReplaceVanillaTreasureEvent replaceVanillaTreasureEvent = new McMMOReplaceVanillaTreasureEvent(fishingCatch, replacementCatch);
+                        McMMOReplaceVanillaTreasureEvent replaceVanillaTreasureEvent = new McMMOReplaceVanillaTreasureEvent(fishingCatch, replacementCatch, player);
                         Bukkit.getPluginManager().callEvent(replaceVanillaTreasureEvent);
 
                         //Replace