From dde3ec26ba57e3bd73d81c2ab7b977811f8390a0 Mon Sep 17 00:00:00 2001 From: poma123 Date: Sat, 25 Jul 2020 13:51:10 +0200 Subject: [PATCH] Requested changes --- .../slimefun4/implementation/SlimefunPlugin.java | 2 -- .../slimefun4/implementation/listeners/PiglinListener.java | 6 ++++++ src/main/resources/languages/messages_en.yml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java index e77bd46ab..45af2a10e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java @@ -10,11 +10,9 @@ import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; import org.bukkit.Bukkit; import org.bukkit.Server; import org.bukkit.command.Command; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PiglinListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PiglinListener.java index a1898c8b1..0dca857b1 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PiglinListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/PiglinListener.java @@ -2,6 +2,7 @@ package io.github.thebusybiscuit.slimefun4.implementation.listeners; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; @@ -47,9 +48,14 @@ public class PiglinListener implements Listener { itemStack = e.getPlayer().getInventory().getItemInMainHand(); } + if (itemStack.getType() != Material.GOLD_INGOT) { + return; + } + SlimefunItem sfItem = SlimefunItem.getByItem(itemStack); if (sfItem != null) { + SlimefunPlugin.getLocalization().sendMessage(e.getPlayer(), "messages.piglin-barter", true); e.setCancelled(true); } } diff --git a/src/main/resources/languages/messages_en.yml b/src/main/resources/languages/messages_en.yml index e0a84ce44..98d97cdef 100644 --- a/src/main/resources/languages/messages_en.yml +++ b/src/main/resources/languages/messages_en.yml @@ -110,6 +110,7 @@ messages: disabled-item: '&4&lThis Item has been disabled! How did you even get that?' no-tome-yourself: '&cYou cannot use the &4Tome of Knowledge &con yourself...' multimeter: '&bStored Energy: &3%stored% &b/ &3%capacity%' + piglin-barter: '&4You cannot barter with piglins using Slimefun items' talisman: anvil: '&a&oYour Talisman saved your tool from breaking'