From f47912f001de09dc36b2b66a85f9570789c1f409 Mon Sep 17 00:00:00 2001
From: mergu <jhopkins@vt.edu>
Date: Mon, 5 Nov 2018 06:05:28 -0500
Subject: [PATCH] Fix npc path block updates (#1611)

* Fix npc path block updates

* Only update pathfind blocks in debug mode
---
 .../java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java | 2 +-
 .../java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java | 2 +-
 .../java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
index 59885a0ab..a877b0b83 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -471,7 +471,7 @@ public class NMSImpl implements NMSBridge {
 
             @Override
             public void stop() {
-                if (navigation.k() != null) {
+                if (params.debug() && navigation.k() != null) {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         for (int i = 0; i < navigation.k().d(); i++) {
                             PathPoint pp = navigation.k().a(i);
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
index c9d87e747..8e723d591 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -474,7 +474,7 @@ public class NMSImpl implements NMSBridge {
 
             @Override
             public void stop() {
-                if (navigation.l() != null) {
+                if (params.debug() && navigation.l() != null) {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         for (int i = 0; i < navigation.l().d(); i++) {
                             PathPoint pp = navigation.l().a(i);
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index b9b26f7b9..5dee40aca 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -19,6 +19,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.World;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
@@ -486,13 +487,13 @@ public class NMSImpl implements NMSBridge {
 
             @Override
             public void stop() {
-                if (navigation.m() != null) {
+                if (params.debug() && navigation.m() != null) {
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         for (int i = 0; i < navigation.m().d(); i++) {
                             PathPoint pp = navigation.m().a(i);
                             org.bukkit.block.Block block = new Vector(pp.a, pp.b, pp.c).toLocation(player.getWorld())
                                     .getBlock();
-                            player.sendBlockChange(block.getLocation(), block.getType(), block.getData());
+                            player.sendBlockChange(block.getLocation(), block.getBlockData());
                         }
                     }
                 }
@@ -519,11 +520,11 @@ public class NMSImpl implements NMSBridge {
                     lastSpeed = params.speed();
                 }
                 if (params.debug() && !NMSImpl.isNavigationFinished(navigation)) {
+                    BlockData data = Material.DANDELION.createBlockData();
                     for (Player player : Bukkit.getOnlinePlayers()) {
                         for (int i = 0; i < navigation.m().d(); i++) {
                             PathPoint pp = navigation.m().a(i);
-                            player.sendBlockChange(new Vector(pp.a, pp.b, pp.c).toLocation(player.getWorld()),
-                                    Material.SUNFLOWER, (byte) 0);
+                            player.sendBlockChange(new Vector(pp.a, pp.b, pp.c).toLocation(player.getWorld()), data);
                         }
                     }
                 }