From 0333dd1b166765f88324999bec56c25d4d98002c Mon Sep 17 00:00:00 2001 From: jrbudda Date: Wed, 8 Mar 2017 21:03:19 -0500 Subject: [PATCH] v7 --- config-instructions.yml | 3 ++- config.yml | 3 ++- plugin.yml | 2 +- src/org/vivecraft/VSE.java | 4 +++- src/org/vivecraft/listeners/VivecraftNetworkListener.java | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config-instructions.yml b/config-instructions.yml index fb73545..727f8e1 100644 --- a/config-instructions.yml +++ b/config-instructions.yml @@ -65,4 +65,5 @@ climbey: #The list of blocks for use with include/exclude block mode. use name or id. Specify data with :data. i.e. red wool is 'wool:14' or '35:14'. uses mojang block names, not spigot materials. blocklist: - wool:0 - - dirt \ No newline at end of file + - dirt + - grass \ No newline at end of file diff --git a/config.yml b/config.yml index fb73545..727f8e1 100644 --- a/config.yml +++ b/config.yml @@ -65,4 +65,5 @@ climbey: #The list of blocks for use with include/exclude block mode. use name or id. Specify data with :data. i.e. red wool is 'wool:14' or '35:14'. uses mojang block names, not spigot materials. blocklist: - wool:0 - - dirt \ No newline at end of file + - dirt + - grass \ No newline at end of file diff --git a/plugin.yml b/plugin.yml index 1eac80e..0242343 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: Vivecraft-Spigot-Extensions -version: '1.11-r7-pre' +version: '1.11-r7' main: org.vivecraft.VSE website: http://www.vivecraft.org/ author: jrbudda, jaron780 diff --git a/src/org/vivecraft/VSE.java b/src/org/vivecraft/VSE.java index 0b559fc..9a7abf8 100644 --- a/src/org/vivecraft/VSE.java +++ b/src/org/vivecraft/VSE.java @@ -30,6 +30,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; import org.bukkit.inventory.meta.ItemMeta; @@ -83,6 +84,7 @@ public void onEnable() { ItemMeta meta = is.getItemMeta(); meta.setDisplayName("Jump Boots"); meta.setUnbreakable(true); + meta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE); is.setItemMeta(meta); ShapedRecipe recipe = new ShapedRecipe(is); recipe.shape("B", "S"); @@ -94,6 +96,7 @@ public void onEnable() { ItemMeta meta2 = is2.getItemMeta(); meta2.setDisplayName("Climb Claws"); meta2.setUnbreakable(true); + meta.addItemFlags(ItemFlag.HIDE_UNBREAKABLE); is2.setItemMeta(meta2); ShapedRecipe recipe2 = new ShapedRecipe(is2); recipe2.shape("E E", "S S"); @@ -303,7 +306,6 @@ public void sendPosData() { @Override public void onDisable() { - saveConfig(); getServer().getScheduler().cancelTask(task); super.onDisable(); } diff --git a/src/org/vivecraft/listeners/VivecraftNetworkListener.java b/src/org/vivecraft/listeners/VivecraftNetworkListener.java index c0e5857..1334218 100644 --- a/src/org/vivecraft/listeners/VivecraftNetworkListener.java +++ b/src/org/vivecraft/listeners/VivecraftNetworkListener.java @@ -136,6 +136,7 @@ public void onPluginMessageReceived(String channel, Player sender, byte[] payloa m = 1; else if(mode.trim().equalsIgnoreCase("exclude")) m = 2; + } else { } objectOutputStream.writeByte(m); objectOutputStream.writeObject(vse.blocklist); @@ -147,7 +148,6 @@ else if(mode.trim().equalsIgnoreCase("exclude")) for (byte b : p) { vse.getLogger().info(b+ " "); } - vse.getLogger().info("sent climb " + p.length); objectOutputStream.close(); }