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

Closes #1659

Browse Source
This commit is contained in:
Jesse Boyd 2017-07-07 16:11:46 +10:00
parent f6540bbfcb
commit 9037b74720
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Nukkit/build.gradle
View File

@ -1,12 +1,12 @@
repositories { 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 = "https://oss.sonatype.org/content/repositories/snapshots/"}
maven {url "http://nexus.hc.to/content/repositories/pub_releases"} maven {url "http://nexus.hc.to/content/repositories/pub_releases"}
} }
dependencies { dependencies {
compile project(':Core') 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' compile 'com.google.guava:guava:17.0'
} }

13
Nukkit/src/main/java/com/plotsquared/nukkit/listeners/PlayerEvents.java
View File

@ -151,7 +151,8 @@ public class PlayerEvents extends PlotListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onEntityCombustByEntity(EntityCombustEvent event) { public void onEntityCombustByEntity(EntityCombustEvent event) {
if (event instanceof EntityCombustByEntityEvent) { 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); onEntityDamageByEntityEvent(eventChange);
} }
} }
@ -780,9 +781,9 @@ public void blockDestroy(BlockBreakEvent event) {
return; return;
} }
switch (event.getAction()) { switch (event.getAction()) {
case PlayerInteractEvent.RIGHT_CLICK_BLOCK: case RIGHT_CLICK_BLOCK:
case PlayerInteractEvent.LEFT_CLICK_BLOCK: case LEFT_CLICK_BLOCK:
case PlayerInteractEvent.PHYSICAL: { case PHYSICAL: {
Plot plot = pp.getCurrentPlot(); Plot plot = pp.getCurrentPlot();
if (plot == null || !plot.isAdded(pp.getUUID())) { if (plot == null || !plot.isAdded(pp.getUUID())) {
Block block = event.getBlock(); Block block = event.getBlock();
@ -807,8 +808,8 @@ public void blockDestroy(BlockBreakEvent event) {
} }
return; return;
} }
case PlayerInteractEvent.LEFT_CLICK_AIR: case LEFT_CLICK_AIR:
case PlayerInteractEvent.RIGHT_CLICK_AIR: { case RIGHT_CLICK_AIR: {
Plot plot = pp.getCurrentPlot(); Plot plot = pp.getCurrentPlot();
if (plot == null || !plot.isAdded(pp.getUUID())) { if (plot == null || !plot.isAdded(pp.getUUID())) {
if (plot == null) { if (plot == null) {