Merge pull request #817 from TonytheMacaroni/main

Magic Item Adjustments, Bugfixes
TheComputerGeek2 · Dec 13, 2023 · 4dfee12 · 4dfee12
2 parents bbe4ab7 + 9e266b2
commit 4dfee12
Show file tree

Hide file tree

Showing 16 changed files with 379 additions and 714 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         run: echo "sha_short=$(git rev-parse --short ${{github.sha}})" >> $GITHUB_OUTPUT
       - name: Get version
         id: version
-        run: echo "version=$(grep version gradle.properties | cut -d"=" -f2)" >> $GITHUB_OUTPUT
+        run: echo "version=$(grep version gradle.properties | cut -d"=" -f2 | xargs)" >> $GITHUB_OUTPUT
       - name: Setup Java
         uses: actions/setup-java@v3
         with:

diff --git a/core/src/main/java/com/nisovin/magicspells/commands/MagicCommand.java b/core/src/main/java/com/nisovin/magicspells/commands/MagicCommand.java
@@ -555,7 +555,7 @@ public static void onMagicItem(CommandIssuer issuer, String[] args) {
 		if (player == null) player = getPlayerFromIssuer(issuer);
 		if (player == null) return;
 
-		ItemStack item = magicItem.getItemStack();
+		ItemStack item = magicItem.getItemStack().clone();
 		item.setAmount(amount);
 		player.getInventory().addItem(item);
 		issuer.sendMessage(MagicSpells.getTextColor() + player.getName() + " received a magic item (" + args[0] + " x" + amount + ").");

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/buff/ReachSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/buff/ReachSpell.java
@@ -136,7 +136,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 			}
 
 			addUseAndChargeCost(player);
-		} else if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK && airBlock.getType().isAir()) {
+		} else if (action == Action.RIGHT_CLICK_AIR || action == Action.RIGHT_CLICK_BLOCK && airBlock.isReplaceable()) {
 			// Place
 			ItemStack item = player.getInventory().getItemInMainHand();
 			if (item.isEmpty()) return;

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/command/ItemSerializeSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/command/ItemSerializeSpell.java
@@ -58,6 +58,10 @@ public CastResult cast(SpellData data) {
 		}
 
 		ConfigurationSection section = AlternativeReaderManager.serialize(serializerKey.get(data), item);
+		if (section == null) {
+			sendMessage("Unable to serialize item.", caster);
+			return new CastResult(PostCastAction.ALREADY_HANDLED, data);
+		}
 
 		YamlConfiguration config = new YamlConfiguration();
 		config.set("magic-items." + System.currentTimeMillis(), section);

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/targeted/BuildSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/targeted/BuildSpell.java
@@ -12,6 +12,7 @@
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.RayTraceResult;
+import org.bukkit.block.data.BlockData;
 
 import com.nisovin.magicspells.util.*;
 import com.nisovin.magicspells.MagicSpells;
@@ -110,8 +111,13 @@ private boolean isDenied(Material mat) {
 	}
 
 	private boolean build(Player player, Block block, Block against, ItemStack item, int slot, SpellData data) {
+		if (!block.isReplaceable()) return false;
+
+		BlockData blockData = item.getType().createBlockData();
+		if (!block.canPlace(blockData)) return false;
+
 		BlockState previousState = block.getState();
-		block.setType(item.getType());
+		block.setBlockData(blockData);
 
 		if (checkPlugins.get(data)) {
 			MagicSpellsBlockPlaceEvent event = new MagicSpellsBlockPlaceEvent(block, previousState, against, player.getEquipment().getItemInMainHand(), player, true);

diff --git a/core/src/main/java/com/nisovin/magicspells/spells/targeted/PulserSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/targeted/PulserSpell.java
@@ -118,10 +118,13 @@ public CastResult cast(SpellData data) {
 
 		int yOffset = this.yOffset.get(data);
 		if (yOffset != 0) block = block.getRelative(0, yOffset, 0);
-		if (!block.isPassable()) {
+
+		BlockData blockType = this.blockType.get(data);
+
+		if (!block.canPlace(blockType) || !block.isReplaceable()) {
 			if (checkFace.get(data)) {
 				Block upper = block.getRelative(BlockFace.UP);
-				if (!upper.isPassable()) return noTarget(data);
+				if (!upper.canPlace(blockType) || !block.isReplaceable()) return noTarget(data);
 				block = upper;
 			} else return noTarget(data);
 		}
@@ -136,8 +139,11 @@ public CastResult cast(SpellData data) {
 		block = event.getTargetLocation().getBlock();
 		data = event.getSpellData();
 
-		createPulser(block, data);
+		block.setBlockData(blockType);
+		pulsers.put(block, new Pulser(block, blockType.getMaterial(), data));
+		ticker.start();
 
+		playSpellEffects(data);
 		return new CastResult(PostCastAction.HANDLE_NORMALLY, data);
 	}
 
@@ -159,10 +165,12 @@ public CastResult castAtLocation(SpellData data) {
 		int yOffset = this.yOffset.get(data);
 		if (yOffset != 0) block = block.getRelative(0, yOffset, 0);
 
-		if (!block.isPassable()) {
+		BlockData blockType = this.blockType.get(data);
+
+		if (!block.canPlace(blockType) || !block.isReplaceable()) {
 			if (checkFace.get(data)) {
 				Block upper = block.getRelative(BlockFace.UP);
-				if (!upper.isPassable()) return noTarget(data);
+				if (!upper.canPlace(blockType) || !block.isReplaceable()) return noTarget(data);
 				block = upper;
 			} else return noTarget(data);
 		}
@@ -171,21 +179,14 @@ public CastResult castAtLocation(SpellData data) {
 		location = block.getLocation().toCenterLocation();
 		location.setPitch(pitch);
 		location.setYaw(yaw);
-
 		data = data.location(location);
-		createPulser(block, data);
-
-		return new CastResult(PostCastAction.HANDLE_NORMALLY, data);
-	}
 
-	private void createPulser(Block block, SpellData data) {
-		BlockData blockType = this.blockType.get(data);
 		block.setBlockData(blockType);
-
 		pulsers.put(block, new Pulser(block, blockType.getMaterial(), data));
 		ticker.start();
 
 		playSpellEffects(data);
+		return new CastResult(PostCastAction.HANDLE_NORMALLY, data);
 	}
 
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)