mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Fixes a bug where mobs could pick up altar probe items
This commit is contained in:
parent
f8112ccb37
commit
b3b2ec5978
@ -1,6 +1,8 @@
|
|||||||
package me.mrCookieSlime.Slimefun.listeners;
|
package me.mrCookieSlime.Slimefun.listeners;
|
||||||
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
||||||
|
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.inventory.InventoryPickupItemEvent;
|
import org.bukkit.event.inventory.InventoryPickupItemEvent;
|
||||||
@ -20,7 +22,7 @@ public class ItemPickupListener implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPickup(PlayerPickupItemEvent e) {
|
public void onPickup(PlayerPickupItemEvent e) {
|
||||||
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
||||||
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
|
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
e.getItem().remove();
|
e.getItem().remove();
|
||||||
}
|
}
|
||||||
@ -29,7 +31,7 @@ public class ItemPickupListener implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onMinecartPickup(InventoryPickupItemEvent e) {
|
public void onMinecartPickup(InventoryPickupItemEvent e) {
|
||||||
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
||||||
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
|
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
e.getItem().remove();
|
e.getItem().remove();
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
package me.mrCookieSlime.Slimefun.listeners;
|
package me.mrCookieSlime.Slimefun.listeners;
|
||||||
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
import me.mrCookieSlime.Slimefun.SlimefunStartup;
|
||||||
|
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.EntityPickupItemEvent;
|
import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||||
@ -22,7 +24,7 @@ public class ItemPickupListener_1_12 implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPickup(EntityPickupItemEvent e) {
|
public void onPickup(EntityPickupItemEvent e) {
|
||||||
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
||||||
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
|
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
e.getItem().remove();
|
e.getItem().remove();
|
||||||
}
|
}
|
||||||
@ -31,7 +33,7 @@ public class ItemPickupListener_1_12 implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onMinecartPickup(InventoryPickupItemEvent e) {
|
public void onMinecartPickup(InventoryPickupItemEvent e) {
|
||||||
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
if (e.getItem().hasMetadata("no_pickup")) e.setCancelled(true);
|
||||||
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith("&5&dALTAR &3Probe - &e")) {
|
else if (!e.getItem().hasMetadata("no_pickup") && e.getItem().getItemStack().hasItemMeta() && e.getItem().getItemStack().getItemMeta().hasDisplayName() && e.getItem().getItemStack().getItemMeta().getDisplayName().startsWith(ChatColor.translateAlternateColorCodes('&', "&5&dALTAR &3Probe - &e"))) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
e.getItem().remove();
|
e.getItem().remove();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user