From bab2a70b02e18d315521cbbb494fe4aaaa0927ad Mon Sep 17 00:00:00 2001
From: GeorgH93 <git@georgh93.eu>
Date: Mon, 30 Dec 2024 00:19:18 +0100
Subject: [PATCH] Fix swap with off-hand allows item filter bypass

---
 .../Minepacks/Bukkit/Listener/ItemFilter.java          | 10 +++++++++-
 pom.xml                                                |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java
index 16e8372a..989d74b8 100644
--- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java
+++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Listener/ItemFilter.java
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2023 GeorgH93
+ *   Copyright (C) 2024 GeorgH93
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 import at.pcgamingfreaks.Message.Placeholder.Placeholder;
 import at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack;
 import at.pcgamingfreaks.Minepacks.Bukkit.Minepacks;
+
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -114,6 +115,13 @@ else if((event.getAction() == InventoryAction.HOTBAR_MOVE_AND_READD || event.get
 					event.setCancelled(true);
 				}
 			}
+			else if((event.getAction() == InventoryAction.HOTBAR_MOVE_AND_READD || event.getAction() == InventoryAction.HOTBAR_SWAP) && event.getClick().name().equals("SWAP_OFFHAND"))
+			{
+				if(checkIsBlockedAndShowMessage(player, player.getInventory().getItemInOffHand()))
+				{
+					event.setCancelled(true);
+				}
+			}
 			else if(!player.getInventory().equals(event.getClickedInventory()) && checkIsBlockedAndShowMessage(player, event.getCursor()))
 			{
 				event.setCancelled(true);
diff --git a/pom.xml b/pom.xml
index cec87f92..d421f5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.4.31.5</revision>
+		<revision>2.4.31.6</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>