Soper
/
Spigot-Artillery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added check for shell in hand

master
Soper Aylamo 2021-05-04 23:32:24 -04:00
parent 501bd77d4e
commit 99539fea58
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xyz/soper/arty/debug/DebugCommand.java
View File

@ -1,7 +1,6 @@
package xyz.soper.arty.debug; package xyz.soper.arty.debug;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;

29
src/xyz/soper/arty/event/Listener/MortarInteract.java
View File

@ -4,7 +4,6 @@ import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Nameable; import org.bukkit.Nameable;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Container;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -24,21 +23,29 @@ public class MortarInteract implements Listener {
Player player = event.getPlayer(); Player player = event.getPlayer();
ItemStack item = player.getInventory().getItemInMainHand(); ItemStack item = player.getInventory().getItemInMainHand();
Block block = event.getClickedBlock(); Block block = event.getClickedBlock();
if(block == null) return; if((item.getType() == Material.ARROW)
if(block.getBlockData().getMaterial() == Material.BREWING_STAND){ && item.hasItemMeta()
Nameable brewingStandMortar = (Nameable) event.getClickedBlock().getState(); && item.getItemMeta().hasDisplayName()
String blockName = brewingStandMortar.getCustomName(); && item.getItemMeta().getDisplayName().equals(ChatColor.GRAY + "Shell")){
if(blockName == null) return; if(block == null) {
if(blockName.equals(ChatColor.GRAY + "Basic Mortar") || blockName.equals(ChatColor.GRAY + "Mortar")){ player.sendMessage("Block is null.");
if(event.getAction() == Action.RIGHT_CLICK_BLOCK) event.setCancelled(true); return;
if((item.getType() == Material.ARROW) && item.hasItemMeta() && item.getItemMeta().hasDisplayName() && item.getItemMeta().getDisplayName().equals(ChatColor.GRAY + "Shell")){ }
else if(block.getBlockData().getMaterial() == Material.BREWING_STAND){
player.sendMessage("Block is an brewing stand.");
Nameable brewingStandMortar = (Nameable) event.getClickedBlock().getState();
String blockName = brewingStandMortar.getCustomName();
if(blockName == null) return;
if(blockName.equals(ChatColor.GRAY + "Basic Mortar")
|| blockName.equals(ChatColor.GRAY + "Mortar")){
player.sendMessage("Block is a mortar.");
if(event.getAction() == Action.RIGHT_CLICK_BLOCK) event.setCancelled(true);
MortarHandler mortarHandler = new MortarHandler(new Mortar(block)); MortarHandler mortarHandler = new MortarHandler(new Mortar(block));
player.sendMessage(mortarHandler.fireShell(new Shell(item))); mortarHandler.fireShell(new Shell(item));
if(item.getAmount() > 1) item.setAmount(item.getAmount()-1); if(item.getAmount() > 1) item.setAmount(item.getAmount()-1);
else player.getInventory().setItemInMainHand(null); else player.getInventory().setItemInMainHand(null);
} }
} }
} }
} }
} }

3
src/xyz/soper/arty/util/MortarHandler.java
View File

@ -11,9 +11,8 @@ public class MortarHandler {
this.mortar = mortar; this.mortar = mortar;
} }
public String /*void*/ fireShell(Shell shell){ public void fireShell(Shell shell){
mortar.block.getWorld().playSound(mortar.location, "entity.generic.explode", 1, 1.5F); mortar.block.getWorld().playSound(mortar.location, "entity.generic.explode", 1, 1.5F);
return "DEBUG: Shell has been fired.";
} }
} }