Cancel item merging with protected drops. Closes #255

This commit is contained in:
RoboMWM 2018-09-19 00:02:40 -07:00
parent ad1f32ec8e
commit e21a781536

View File

@ -63,6 +63,7 @@ import org.bukkit.event.entity.EntityInteractEvent;
import org.bukkit.event.entity.EntityPortalEnterEvent; import org.bukkit.event.entity.EntityPortalEnterEvent;
import org.bukkit.event.entity.EntityPortalExitEvent; import org.bukkit.event.entity.EntityPortalExitEvent;
import org.bukkit.event.entity.ExpBottleEvent; import org.bukkit.event.entity.ExpBottleEvent;
import org.bukkit.event.entity.ItemMergeEvent;
import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent;
@ -505,6 +506,14 @@ public class EntityEventHandler implements Listener
} }
} }
} }
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onItemMerge(ItemMergeEvent event)
{
Item item = event.getTarget();
List<MetadataValue> data = item.getMetadata("GP_ITEMOWNER");
event.setCancelled(data != null && data.size() > 0);
}
//when an entity picks up an item //when an entity picks up an item
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)