Redstoner/Modules
Archived
0
Fork 0
Code Activity

Merge branch 'master' into blockplacemods_3.1

Browse Source
This commit is contained in:
Dico
2017-06-03 16:51:23 +02:00
committed by GitHub
parent 9ffa46b66f 511718ca04
commit aeeb8989a3
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/redstoner/modules/blockplacemods/BlockPlaceMods.java
View File

@@ -1,5 +1,17 @@
package com.redstoner.modules.blockplacemods; 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.nemez.cmdmgr.Command;
import com.redstoner.annotations.AutoRegisterListener; import com.redstoner.annotations.AutoRegisterListener;
import com.redstoner.annotations.Version; import com.redstoner.annotations.Version;
@@ -11,12 +23,6 @@ import com.redstoner.modules.blockplacemods.mods.ModAbstract;
import com.redstoner.modules.blockplacemods.mods.ModToggledAbstract; import com.redstoner.modules.blockplacemods.mods.ModToggledAbstract;
import com.redstoner.utils.CommandException; import com.redstoner.utils.CommandException;
import com.redstoner.utils.CommandMap; 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 @AutoRegisterListener
@Version(major = 3, minor = 2, revision = 9, compatible = 3) @Version(major = 3, minor = 2, revision = 9, compatible = 3)
@@ -56,7 +62,6 @@ public final class BlockPlaceMods implements Module, Listener
{ {
mod.unregisterListeners(); mod.unregisterListeners();
} }
try try
{ {
Map<String, org.bukkit.command.Command> commandMap = CommandMap.getCommandMap(); Map<String, org.bukkit.command.Command> commandMap = CommandMap.getCommandMap();
@@ -192,5 +197,4 @@ public final class BlockPlaceMods implements Module, Listener
return true; return true;
} }
} }
} }

3
src/com/redstoner/modules/blockplacemods/mods/ModInventory.java
View File

@@ -3,6 +3,7 @@ package com.redstoner.modules.blockplacemods.mods;
import com.redstoner.modules.datamanager.DataManager; import com.redstoner.modules.datamanager.DataManager;
import com.redstoner.utils.CommandException; import com.redstoner.utils.CommandException;
import com.redstoner.utils.ItemProperties; import com.redstoner.utils.ItemProperties;
import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -109,7 +110,7 @@ public class ModInventory extends ModAbstract
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent event) public void onBlockPlace(BlockPlaceEvent event)
{ {
if (present(event.getPlayer())) if (present(event.getPlayer()) && event.getPlayer().getGameMode() == GameMode.CREATIVE)
{ {
BlockState state = event.getBlock().getState(); BlockState state = event.getBlock().getState();
if (state instanceof InventoryHolder) if (state instanceof InventoryHolder)