From 9037b74720cef41fe9becbc801d437f841ede637 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 7 Jul 2017 16:11:46 +1000 Subject: [PATCH] Closes #1659 --- Nukkit/build.gradle | 4 ++-- .../plotsquared/nukkit/listeners/PlayerEvents.java | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Nukkit/build.gradle b/Nukkit/build.gradle index ff14a95fb..f5933e413 100644 --- a/Nukkit/build.gradle +++ b/Nukkit/build.gradle @@ -1,12 +1,12 @@ repositories { - maven {url "http://ci.regularbox.com/plugin/repository/everything/"} + maven {url "http://ci.mengcraft.com:8080/plugin/repository/everything"} maven { url = "https://oss.sonatype.org/content/repositories/snapshots/"} maven {url "http://nexus.hc.to/content/repositories/pub_releases"} } dependencies { compile project(':Core') - compile 'cn.nukkit:nukkit:1.0-SNAPSHOT' + compile group: "cn.nukkit", name: "nukkit", version: "1.0-20170704.231613-609", changing: true compile 'com.google.guava:guava:17.0' } diff --git a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java b/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java index e69f797b1..7f30f84f8 100644 --- a/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java +++ b/Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java @@ -151,7 +151,8 @@ public class PlayerEvents extends PlotListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) public void onEntityCombustByEntity(EntityCombustEvent event) { if (event instanceof EntityCombustByEntityEvent) { - EntityDamageByEntityEvent eventChange = new EntityDamageByEntityEvent(((EntityCombustByEntityEvent) event).getCombuster(), event.getEntity(), EntityDamageEvent.CAUSE_FIRE_TICK, event.getDuration()); + EntityDamageByEntityEvent eventChange = + new EntityDamageByEntityEvent(((EntityCombustByEntityEvent) event).getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE_TICK, event.getDuration()); onEntityDamageByEntityEvent(eventChange); } } @@ -780,9 +781,9 @@ public void blockDestroy(BlockBreakEvent event) { return; } switch (event.getAction()) { - case PlayerInteractEvent.RIGHT_CLICK_BLOCK: - case PlayerInteractEvent.LEFT_CLICK_BLOCK: - case PlayerInteractEvent.PHYSICAL: { + case RIGHT_CLICK_BLOCK: + case LEFT_CLICK_BLOCK: + case PHYSICAL: { Plot plot = pp.getCurrentPlot(); if (plot == null || !plot.isAdded(pp.getUUID())) { Block block = event.getBlock(); @@ -807,8 +808,8 @@ public void blockDestroy(BlockBreakEvent event) { } return; } - case PlayerInteractEvent.LEFT_CLICK_AIR: - case PlayerInteractEvent.RIGHT_CLICK_AIR: { + case LEFT_CLICK_AIR: + case RIGHT_CLICK_AIR: { Plot plot = pp.getCurrentPlot(); if (plot == null || !plot.isAdded(pp.getUUID())) { if (plot == null) {