Fix Drilling + Power interaction

Flo56958 · Oct 31, 2020 · 8093512 · 8093512
1 parent 04b8ea1
commit 8093512
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/de/flo56958/minetinker/data/Lists.java b/src/main/java/de/flo56958/minetinker/data/Lists.java
@@ -8,12 +8,12 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class Lists {
 
-	public static final HashMap<Player, BlockFace> BLOCKFACE = new HashMap<>();
+	public static final ConcurrentHashMap<Player, BlockFace> BLOCKFACE = new ConcurrentHashMap<>();
 	private static final FileConfiguration config = MineTinker.getPlugin().getConfig();
 	public static final List<String> DROPLOOT = config.getStringList("LevelUpEvents.DropLoot.Items");
 	public static List<String> WORLDS;

diff --git a/src/main/java/de/flo56958/minetinker/listeners/PlayerListener.java b/src/main/java/de/flo56958/minetinker/listeners/PlayerListener.java
@@ -8,6 +8,7 @@
 import de.flo56958.minetinker.utils.ChatWriter;
 import de.flo56958.minetinker.utils.LanguageManager;
 import de.flo56958.minetinker.utils.Updater;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
@@ -242,7 +243,7 @@ public void onInteract(@NotNull final PlayerInteractEvent event) {
 		}
 
 		if (!event.getBlockFace().equals(BlockFace.SELF)) {
-			Lists.BLOCKFACE.replace(event.getPlayer(), event.getBlockFace());
+			Bukkit.getScheduler().runTaskLaterAsynchronously(MineTinker.getPlugin(), () -> Lists.BLOCKFACE.replace(event.getPlayer(), event.getBlockFace()), 2);
 		}
 
 		if (!modManager.allowBookToModifier()) {

diff --git a/src/main/java/de/flo56958/minetinker/modifiers/ModManager.java b/src/main/java/de/flo56958/minetinker/modifiers/ModManager.java
@@ -92,6 +92,7 @@ public class ModManager {
 		incompatibilityList.add(MultiShot.instance().getKey() + ":" + Piercing.instance().getKey());
 		incompatibilityList.add(Power.instance().getKey() + ":" + Timber.instance().getKey());
 		incompatibilityList.add(Drilling.instance().getKey() + ":" + Timber.instance().getKey());
+		//incompatibilityList.add(Drilling.instance().getKey() + ":" + Power.instance().getKey());
 		incompatibilityList.add(SelfRepair.instance().getKey() + ":" + Photosynthesis.instance().getKey());
 		incompatibilityList.add(MultiShot.instance().getKey() + ":" + Magical.instance().getKey());
 		incompatibilityList.add(Magical.instance().getKey() + ":" + Ender.instance().getKey());

diff --git a/src/main/java/de/flo56958/minetinker/modifiers/types/Channeling.java b/src/main/java/de/flo56958/minetinker/modifiers/types/Channeling.java
@@ -65,9 +65,9 @@ public void reload() {
 		config.addDefault("Allowed", true);
 		config.addDefault("Color", "%GRAY%");
 		config.addDefault("MaxLevel", 1);
-		config.addDefault("SlotCost", 1);
+		config.addDefault("SlotCost", 3);
 
-		config.addDefault("EnchantCost", 10);
+		config.addDefault("EnchantCost", 50);
 		config.addDefault("Enchantable", false);
 
 		config.addDefault("Recipe.Enabled", true);