EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
dordsor21 2020-12-11 11:42:19 +00:00
parent 18f13b7d15
commit 6eb2958afc
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View File

@ -1130,7 +1130,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
if (!(placed instanceof Boat)) { if (!(placed instanceof Boat)) {
return; return;
} }
BukkitPlayer pp = BukkitUtil.getPlayer(player); BukkitPlayer pp = BukkitUtil.adapt(event.getPlayer());
PlotArea area = pp.getPlotAreaAbs(); PlotArea area = pp.getPlotAreaAbs();
if (area == null) { if (area == null) {
return; return;
@ -1138,7 +1138,7 @@ public class PlayerEventListener extends PlotListener implements Listener {
PlayerBlockEventType eventType = PlayerBlockEventType.PLACE_VEHICLE; PlayerBlockEventType eventType = PlayerBlockEventType.PLACE_VEHICLE;
Block block = event.getBlock(); Block block = event.getBlock();
BlockType blockType = BukkitAdapter.asBlockType(block.getType()); BlockType blockType = BukkitAdapter.asBlockType(block.getType());
Location location = BukkitUtil.getLocation(block.getLocation()); Location location = BukkitUtil.adapt(block.getLocation());
if (!PlotSquared.get().getEventDispatcher() if (!PlotSquared.get().getEventDispatcher()
.checkPlayerBlockEvent(pp, eventType, location, blockType, true)) { .checkPlayerBlockEvent(pp, eventType, location, blockType, true)) {
event.setCancelled(true); event.setCancelled(true);