From 935e7f8797778cfafbb438f48ab5ea7374ea2cc1 Mon Sep 17 00:00:00 2001
From: coralpapa <coralpapamc@gmail.com>
Date: Sun, 18 Aug 2019 10:49:29 -0700
Subject: [PATCH] Correct item merge handler (#588)

Fixes #585
---
 .../me/ryanhamshire/GriefPrevention/EntityEventHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index 4a1fb29..59a904d 100644
--- a/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/main/java/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -544,7 +544,7 @@ public class EntityEventHandler implements Listener
 	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
 	public void onItemMerge(ItemMergeEvent event)
 	{
-		Item item = event.getTarget();
+		Item item = event.getEntity();
 		List<MetadataValue> data = item.getMetadata("GP_ITEMOWNER");
 		event.setCancelled(data != null && data.size() > 0);
 	}