Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 21:48:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix announcer GUI exceptions

Browse Source
This commit is contained in:
Daniel Saukel 2017-10-05 17:00:48 +02:00
parent a3e890d704
commit 40c9547a29
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java
View File

@ -458,7 +458,11 @@ public class Announcer {
*/ */
public DGroup getDGroupByButton(ItemStack button) { public DGroup getDGroupByButton(ItemStack button) {
int index = buttons.indexOf(button); int index = buttons.indexOf(button);
if (dGroups.size() <= index || index < 0) {
return null;
} else {
return dGroups.get(index); return dGroups.get(index);
} }
}
} }

5
src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerListener.java
View File

@ -23,6 +23,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Wool;
/** /**
* @author Daniel Saukel * @author Daniel Saukel
@ -37,9 +38,9 @@ public class AnnouncerListener implements Listener {
Player player = (Player) event.getWhoClicked(); Player player = (Player) event.getWhoClicked();
Inventory gui = event.getInventory(); Inventory gui = event.getInventory();
ItemStack button = gui.getItem(event.getSlot()); ItemStack button = event.getCurrentItem();
Announcer announcer = DungeonsXL.getInstance().getAnnouncers().getByGUI(gui); Announcer announcer = DungeonsXL.getInstance().getAnnouncers().getByGUI(gui);
if (announcer != null) { if (announcer != null && button != null && button.getData() instanceof Wool) {
announcer.clickGroupButton(player, button); announcer.clickGroupButton(player, button);
} }
} }