From a2404d1bc6ea22aace4afa9e5fc8e5607965ce04 Mon Sep 17 00:00:00 2001 From: Nathan Curran <30569566+Focusvity@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:26:51 +1100 Subject: [PATCH] Restrict the owner length to 16 instead of blocking them (#170) * Restrict the owner length to 16 * no assertion thank u Co-authored-by: super --- .../blocking/BlockBlocker.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java index 34a4eeea..69084610 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java @@ -5,19 +5,14 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_15_R1.NBTTagCompound; -import net.minecraft.server.v1_15_R1.NBTTagString; import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.block.Skull; -import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; public class BlockBlocker extends FreedomService @@ -149,17 +144,15 @@ public class BlockBlocker extends FreedomService case PLAYER_HEAD: case PLAYER_WALL_HEAD: { - SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta(); - if (meta != null) + Skull skull = (Skull) event.getBlockPlaced().getState(); + if (skull.hasOwner() && skull.getOwner().length() > 16) { - if (meta.hasOwner()) + skull.setOwner(skull.getOwner().substring(0, 16)); + SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta(); + if (meta != null) { - if (meta.getOwner().length() > 100) - { - player.sendMessage(ChatColor.GRAY + "Instead of using Pi to crash a server, how about you use it to impress nerds like yourself?"); - player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); - event.setCancelled(true); - } + meta.setOwner(meta.getOwner().substring(0, 16)); + event.getItemInHand().setItemMeta(meta); } } break;