From 6eb2958afc62a64f01ebcb2ef01d45480860d0a2 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 11 Dec 2020 11:42:19 +0000
Subject: [PATCH] Fix merge issue

---
 .../com/plotsquared/bukkit/listener/PlayerEventListener.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
index 40feaf4b0..e55448f0b 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@@ -1130,7 +1130,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
         if (!(placed instanceof Boat)) {
             return;
         }
-        BukkitPlayer pp = BukkitUtil.getPlayer(player);
+        BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
         PlotArea area = pp.getPlotAreaAbs();
         if (area == null) {
             return;
@@ -1138,7 +1138,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
         PlayerBlockEventType eventType = PlayerBlockEventType.PLACE_VEHICLE;
         Block block = event.getBlock();
         BlockType blockType = BukkitAdapter.asBlockType(block.getType());
-        Location location = BukkitUtil.getLocation(block.getLocation());
+        Location location = BukkitUtil.adapt(block.getLocation());
         if (!PlotSquared.get().getEventDispatcher()
             .checkPlayerBlockEvent(pp, eventType, location, blockType, true)) {
             event.setCancelled(true);