From 511718ca04b7bd145209acf93d4bf5769493f4df Mon Sep 17 00:00:00 2001 From: Pepich Date: Tue, 30 May 2017 18:52:01 +0200 Subject: [PATCH] Fixed ModInventory being able to spawn in items in survival --- .../blockplacemods/BlockPlaceMods.java | 22 +++++++++++-------- .../blockplacemods/mods/ModInventory.java | 3 ++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java b/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java index b38e8b4..f9b12a6 100644 --- a/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java +++ b/src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java @@ -1,5 +1,17 @@ package com.redstoner.modules.blockplacemods; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; + +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.Listener; + import com.nemez.cmdmgr.Command; import com.redstoner.annotations.AutoRegisterListener; import com.redstoner.annotations.Version; @@ -11,15 +23,9 @@ import com.redstoner.modules.blockplacemods.mods.ModAbstract; import com.redstoner.modules.blockplacemods.mods.ModToggledAbstract; import com.redstoner.utils.CommandException; import com.redstoner.utils.CommandMap; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.Listener; - -import java.util.*; @AutoRegisterListener -@Version(major = 3, minor = 2, revision = 8, compatible = 3) +@Version(major = 3, minor = 2, revision = 9, compatible = 3) public final class BlockPlaceMods implements Module, Listener { public static String PREFIX = ChatColor.GRAY + "[" + ChatColor.DARK_GREEN + "BPM" + ChatColor.GRAY + "]" @@ -56,7 +62,6 @@ public final class BlockPlaceMods implements Module, Listener { mod.unregisterListeners(); } - try { Map commandMap = CommandMap.getCommandMap(); @@ -191,5 +196,4 @@ public final class BlockPlaceMods implements Module, Listener return true; } } - } diff --git a/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java b/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java index 5c5a539..4b44680 100644 --- a/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java +++ b/src/com/redstoner/modules/blockplacemods/mods/ModInventory.java @@ -2,6 +2,7 @@ package com.redstoner.modules.blockplacemods.mods; import java.util.Arrays; +import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; @@ -110,7 +111,7 @@ public class ModInventory extends ModAbstract @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlockPlace(BlockPlaceEvent event) { - if (present(event.getPlayer())) + if (present(event.getPlayer()) && event.getPlayer().getGameMode() == GameMode.CREATIVE) { BlockState state = event.getBlock().getState(); if (state instanceof InventoryHolder)