diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index 39147ea3..536472e6 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -387,6 +387,8 @@ public class FactionsPlayerListener implements Listener { Faction factionFrom = Board.getInstance().getFactionAt(from); Faction factionTo = Board.getInstance().getFactionAt(to); boolean changedFaction = (factionFrom != factionTo); + + if (changedFaction) { Bukkit.getServer().getPluginManager().callEvent(new FPlayerEnteredFactionEvent(factionTo,factionFrom,me)); if (P.p.getConfig().getBoolean("Title.Show-Title")) { @@ -438,6 +440,7 @@ public class FactionsPlayerListener implements Listener { if (me.isMapAutoUpdating()) { + Bukkit.broadcastMessage(""); if (showTimes.containsKey(player.getUniqueId()) && (showTimes.get(player.getUniqueId()) > System.currentTimeMillis())) { if (P.p.getConfig().getBoolean("findfactionsexploit.log", false)) { P.p.log(Level.WARNING, "%s tried to show a faction map too soon and triggered exploit blocker.", player.getName()); diff --git a/src/main/java/com/massivecraft/factions/util/InventoryUtil.java b/src/main/java/com/massivecraft/factions/util/InventoryUtil.java index 1ccef9b6..6a5f3610 100644 --- a/src/main/java/com/massivecraft/factions/util/InventoryUtil.java +++ b/src/main/java/com/massivecraft/factions/util/InventoryUtil.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.util; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Item; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -23,8 +24,8 @@ public class InventoryUtil { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); BukkitObjectOutputStream dataOutput = new BukkitObjectOutputStream(outputStream); dataOutput.writeInt(items.length); - for (int i = 0; i < items.length; i++) { - dataOutput.writeObject(items[i]); + for (ItemStack item: items) { + dataOutput.writeObject(item); } dataOutput.close(); return Base64Coder.encodeLines(outputStream.toByteArray());