From a827c4a28d8252fba2b1143f499eb8021fbae22a Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Thu, 9 Jun 2022 01:02:40 +0200
Subject: [PATCH] Fix marry gift command

---
 .../Bukkit/Commands/GiftCommand.java              | 15 +++++++--------
 pom.xml                                           |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/GiftCommand.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/GiftCommand.java
index 853fef57..a1599b7a 100644
--- a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/GiftCommand.java
+++ b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bukkit/Commands/GiftCommand.java
@@ -20,10 +20,7 @@
 import at.pcgamingfreaks.Bukkit.ItemFilter;
 import at.pcgamingfreaks.Bukkit.ItemNameResolver;
 import at.pcgamingfreaks.Bukkit.Message.Message;
-import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.GameModePlaceholderProcessor;
-import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.ItemAmountPlaceholderProcessor;
-import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.ItemMetadataPlaceholderProcessor;
-import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.ItemNamePlaceholderProcessor;
+import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.*;
 import at.pcgamingfreaks.Bukkit.Message.Placeholder.Processors.Wrappers.ItemStackWrapper;
 import at.pcgamingfreaks.Bukkit.Util.InventoryUtils;
 import at.pcgamingfreaks.MarriageMaster.Bukkit.API.AcceptPendingRequest;
@@ -35,6 +32,7 @@
 import at.pcgamingfreaks.MarriageMaster.Bukkit.Range;
 import at.pcgamingfreaks.MarriageMaster.Permissions;
 import at.pcgamingfreaks.MarriageMaster.Placeholder.Placeholders;
+import at.pcgamingfreaks.MarriageMaster.Placeholder.Processors.NamePlaceholderProcessor;
 import at.pcgamingfreaks.Message.Placeholder.Placeholder;
 
 import org.bukkit.Bukkit;
@@ -80,10 +78,11 @@ public GiftCommand(MarriageMaster plugin)
 		worldBlacklist          = plugin.getConfiguration().getGiftBlackListedWorlds();
 		blacklistEnabled        = !worldBlacklist.isEmpty();
 
-		final Placeholder itemNamePlaceholder = new Placeholder("ItemName", new ItemNamePlaceholderProcessor(itemNameResolver));
+		final Placeholder[] itemNamePlaceholder = { new Placeholder("ItemName", new ItemNamePlaceholderProcessor(itemNameResolver)),
+													new Placeholder("ItemDisplayName", new ItemDisplayNamePlaceholderProcessor(itemNameResolver)) };
 		final Placeholder currentGameModePlaceholder = new Placeholder("CurrentGameMode", new GameModePlaceholderProcessor()); // TODO translate
 		final Placeholder[] itemPlaceholders = { new Placeholder("ItemAmount", ItemAmountPlaceholderProcessor.INSTANCE),
-		                                         itemNamePlaceholder,
+		                                         itemNamePlaceholder[0], itemNamePlaceholder[1],
 		                                         new Placeholder("ItemMetaJSON", new ItemMetadataPlaceholderProcessor(plugin.getLogger())) };
 
 		messageGameModeNotAllowedSender   = plugin.getLanguage().getMessage("Ingame.Gift.GameModeNotAllowedSender").replaceAll("\\{AllowedGameModes}", currentGameModePlaceholder.getProcessor().process(allowedSendGameModes)).placeholders(currentGameModePlaceholder);
@@ -91,7 +90,7 @@ public GiftCommand(MarriageMaster plugin)
 		messageNoItemInHand               = plugin.getLanguage().getMessage("Ingame.Gift.NoItemInHand");
 		messagePartnerInvFull             = plugin.getLanguage().getMessage("Ingame.Gift.PartnerInvFull");
 		messageItemSent                   = plugin.getLanguage().getMessage("Ingame.Gift.ItemSent").placeholders(Placeholders.PLAYER_NAME).placeholders(itemPlaceholders);
-		messageItemReceived               = plugin.getLanguage().getMessage("Ingame.Gift.ItemReceived").placeholders(Placeholders.PLAYER_NAME).placeholders(itemPlaceholders);
+		messageItemReceived               = plugin.getLanguage().getMessage("Ingame.Gift.ItemReceived").placeholders(new Placeholder("Name", NamePlaceholderProcessor.INSTANCE), new Placeholder("DisplayName", NamePlaceholderProcessor.INSTANCE)).placeholders(itemPlaceholders);
 		messageWorldNotAllowed            = plugin.getLanguage().getMessage("Ingame.Gift.WorldNotAllowed");
 		messageItemNotAllowed             = plugin.getLanguage().getMessage("Ingame.Gift.ItemNotAllowed").placeholders(itemNamePlaceholder);
 
@@ -196,9 +195,9 @@ public void execute(@NotNull CommandSender sender, @NotNull String mainCommandAl
 						}
 						else
 						{
-							bPartner.getInventory().setItem(slot, its);
 							messageItemSent.send(sender, partner, wrappedItemStack);
 							messageItemReceived.send(bPartner, partner, wrappedItemStack);
+							bPartner.getInventory().setItem(slot, its);
 						}
 						InventoryUtils.setItemInMainHand(bPlayer, null);
 					}
diff --git a/pom.xml b/pom.xml
index b1990893..d1600b00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.6</revision>
+		<revision>2.6.1</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<bukkitVersion>1.15.2-R0.1-SNAPSHOT</bukkitVersion>