From 63b34175fe383e7cdd1f09315d8ffce1b8c868be Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 3 Apr 2021 20:54:28 +0200 Subject: [PATCH 1/3] Add ItemFrameListener --- .../src/de/steamwar/bausystem/BauSystem.java | 1 + .../bausystem/world/ItemFrameListener.java | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java index 337ea4a..f946b96 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java @@ -102,6 +102,7 @@ public class BauSystem extends JavaPlugin implements Listener { Bukkit.getPluginManager().registerEvents(new TNTSimulatorListener(), this); Bukkit.getPluginManager().registerEvents(new CommandGUI(), this); Bukkit.getPluginManager().registerEvents(new DetonatorListener(), this); + Bukkit.getPluginManager().registerEvents(new ItemFrameListener(), this); VersionedRunnable.call(new VersionedRunnable(() -> Bukkit.getPluginManager().registerEvents(new RedstoneListener(), this), 15)); new AFKStopper(); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java new file mode 100644 index 0000000..645a078 --- /dev/null +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java @@ -0,0 +1,42 @@ +/* + * This file is a part of the SteamWar software. + * + * Copyright (C) 2020 SteamWar.de-Serverteam + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package de.steamwar.bausystem.world; + +import org.bukkit.entity.ItemFrame; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageByEntityEvent; + +public class ItemFrameListener implements Listener { + + @EventHandler + public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Player)) { + return; + } + if (!(event.getEntity() instanceof ItemFrame)) { + return; + } + event.setCancelled(true); + event.getEntity().remove(); + } + +} -- 2.39.5 From ca13e3236ca44893381385c6c501bd71c1dd2a44 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 3 Apr 2021 21:47:58 +0200 Subject: [PATCH 2/3] Fix ItemFrameListener with Item in ItemFrame --- BauSystem_API/src/de/steamwar/bausystem/SWUtils.java | 3 +++ .../src/de/steamwar/bausystem/world/ItemFrameListener.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java b/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java index 693cd1f..5f22d5b 100644 --- a/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java +++ b/BauSystem_API/src/de/steamwar/bausystem/SWUtils.java @@ -29,6 +29,9 @@ import java.util.List; public class SWUtils { public static void giveItemToPlayer(Player player, ItemStack itemStack) { + if (itemStack == null || itemStack.getType() == Material.AIR) { + return; + } for (int i = 0; i < player.getInventory().getSize(); i++) { ItemStack current = player.getInventory().getItem(i); if (current != null && current.isSimilar(itemStack)) { diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java index 645a078..eefcd23 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java @@ -19,6 +19,7 @@ package de.steamwar.bausystem.world; +import de.steamwar.bausystem.SWUtils; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -36,7 +37,9 @@ public class ItemFrameListener implements Listener { return; } event.setCancelled(true); - event.getEntity().remove(); + ItemFrame itemFrame = (ItemFrame) event.getEntity(); + SWUtils.giveItemToPlayer((Player) event.getDamager(), itemFrame.getItem()); + itemFrame.remove(); } } -- 2.39.5 From 7eb8a4b53b2e40e8d1be800a33deb813ad0a145c Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 3 Apr 2021 21:53:25 +0200 Subject: [PATCH 3/3] Fix ItemFrameListener with Item in ItemFrame --- .../steamwar/bausystem/world/ItemFrameListener.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java index eefcd23..a8c9618 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/world/ItemFrameListener.java @@ -20,11 +20,13 @@ package de.steamwar.bausystem.world; import de.steamwar.bausystem.SWUtils; +import org.bukkit.Material; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.inventory.ItemStack; public class ItemFrameListener implements Listener { @@ -38,8 +40,13 @@ public class ItemFrameListener implements Listener { } event.setCancelled(true); ItemFrame itemFrame = (ItemFrame) event.getEntity(); - SWUtils.giveItemToPlayer((Player) event.getDamager(), itemFrame.getItem()); - itemFrame.remove(); + ItemStack itemStack = itemFrame.getItem(); + if (itemStack.getType() != Material.AIR) { + SWUtils.giveItemToPlayer((Player) event.getDamager(), itemFrame.getItem()); + itemFrame.setItem(null); + } else { + itemFrame.remove(); + } } } -- 2.39.5