EpicKnarvik97/BlockHunt
EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove outdated block durability checks in favour of BlockData

Browse Source
This commit is contained in:
selfslaughter 2020-04-12 19:58:08 +10:00
parent 9cc26f2f44
commit c28ccaac25
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/nl/Steffion/BlockHunt/BlockHunt.java
View File

@ -48,6 +48,7 @@ import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.configuration.serialization.ConfigurationSerialization;
@ -280,14 +281,10 @@ public class BlockHunt extends JavaPlugin implements Listener {
arenaPlayer.getInventory().setItem(8, blockCount); arenaPlayer.getInventory().setItem(8, blockCount);
arenaPlayer.getInventory().setHelmet(new ItemStack(block)); arenaPlayer.getInventory().setHelmet(new ItemStack(block));
MemoryStorage.pBlock.put(arenaPlayer, block); MemoryStorage.pBlock.put(arenaPlayer, block);
String blockName = block.getType().name();
if (block.getDurability() != 0) { blockName = WordUtils.capitalizeFully(blockName.replace("_", " "));
MessageManager.sendFMessage(arenaPlayer, ConfigC.normal_ingameBlock, MessageManager.sendFMessage(arenaPlayer, ConfigC.normal_ingameBlock,
"block-" + block.getType().name().replaceAll("_", "").replaceAll("BLOCK", "").toLowerCase() + ":" + block.getDurability()); "block-" + blockName);
} else {
MessageManager.sendFMessage(arenaPlayer, ConfigC.normal_ingameBlock,
"block-" + block.getType().name().replaceAll("_", "").replaceAll("BLOCK", "").toLowerCase());
}
} }
} }
} }
@ -399,9 +396,10 @@ public class BlockHunt extends JavaPlugin implements Listener {
block.setAmount(block.getAmount() - 1); block.setAmount(block.getAmount() - 1);
} else { } else {
Block pBlock = player.getLocation().getBlock(); Block pBlock = player.getLocation().getBlock();
if (pBlock.getType().equals(Material.AIR) || pBlock.getType().equals(Material.WATER) BlockData pBlockData = pBlock.getBlockData();
|| pBlock.getType().equals(Material.WATER)) { if (pBlockData.getMaterial().equals(Material.AIR) || pBlockData.getMaterial().equals(Material.WATER)
if (pBlock.getType().equals(Material.WATER) || pBlock.getType().equals(Material.WATER)) { || pBlockData.getMaterial().equals(Material.WATER)) {
if (pBlockData.getMaterial().equals(Material.WATER) || pBlockData.getMaterial().equals(Material.WATER)) {
MemoryStorage.hiddenLocWater.put(player, true); MemoryStorage.hiddenLocWater.put(player, true);
} else { } else {
MemoryStorage.hiddenLocWater.put(player, false); MemoryStorage.hiddenLocWater.put(player, false);
@ -411,28 +409,22 @@ public class BlockHunt extends JavaPlugin implements Listener {
for (Player pl : Bukkit.getOnlinePlayers()) { for (Player pl : Bukkit.getOnlinePlayers()) {
if (!pl.equals(player)) { if (!pl.equals(player)) {
pl.hidePlayer(player); pl.hidePlayer(player);
pl.sendBlockChange(pBlock.getLocation(), block.getType(), (byte) block.getDurability()); pl.sendBlockChange(pBlock.getLocation(), block.getType().createBlockData());
} }
} }
block.addUnsafeEnchantment(Enchantment.DURABILITY, 10); block.addUnsafeEnchantment(Enchantment.DURABILITY, 10);
player.playSound(pLoc, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); player.playSound(pLoc, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1);
MemoryStorage.hiddenLoc.put(player, moveLoc); MemoryStorage.hiddenLoc.put(player, moveLoc);
if (block.getDurability() != 0) { String blockName = block.getType().name();
MessageManager.sendFMessage( blockName = WordUtils.capitalizeFully(blockName.replace("_", " "));
player,
ConfigC.normal_ingameNowSolid,
"block-" + block.getType().name().replaceAll("_", "").replaceAll("BLOCK", "").toLowerCase() + ":"
+ block.getDurability());
} else {
MessageManager.sendFMessage(player, ConfigC.normal_ingameNowSolid, "block-" MessageManager.sendFMessage(player, ConfigC.normal_ingameNowSolid, "block-"
+ block.getType().name().replaceAll("_", "").replaceAll("BLOCK", "").toLowerCase()); + blockName);
}
} }
for (Player pl : Bukkit.getOnlinePlayers()) { for (Player pl : Bukkit.getOnlinePlayers()) {
if (!pl.equals(player)) { if (!pl.equals(player)) {
pl.hidePlayer(player); pl.hidePlayer(player);
pl.sendBlockChange(pBlock.getLocation(), block.getType(), (byte) block.getDurability()); pl.sendBlockChange(pBlock.getLocation(), block.getType().createBlockData());
} }
} }
} else { } else {

5
src/main/java/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java
View File

@ -5,6 +5,7 @@ import nl.Steffion.BlockHunt.Arena.ArenaType;
import nl.Steffion.BlockHunt.MemoryStorage; import nl.Steffion.BlockHunt.MemoryStorage;
import nl.Steffion.BlockHunt.Managers.MessageManager; import nl.Steffion.BlockHunt.Managers.MessageManager;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -97,8 +98,10 @@ public class OnInventoryClickEvent implements Listener {
if (event.getCurrentItem() != null) { if (event.getCurrentItem() != null) {
if (event.getCurrentItem().getType().isBlock()) { if (event.getCurrentItem().getType().isBlock()) {
MemoryStorage.choosenBlock.put(player, event.getCurrentItem()); MemoryStorage.choosenBlock.put(player, event.getCurrentItem());
String blockName = event.getCurrentItem().getType().name();
blockName = WordUtils.capitalizeFully(blockName.replace("_", " "));
MessageManager.sendFMessage(player, ConfigC.normal_shopChoosenBlock, "block-" MessageManager.sendFMessage(player, ConfigC.normal_shopChoosenBlock, "block-"
+ event.getCurrentItem().getType().toString().replaceAll("_", "").replaceAll("BLOCK", "").toLowerCase()); + blockName);
} else { } else {
MessageManager.sendFMessage(player, ConfigC.error_setNotABlock); MessageManager.sendFMessage(player, ConfigC.error_setNotABlock);
} }