From fc7e940cbe33bbc1c8e6261d39306bb05b02e372 Mon Sep 17 00:00:00 2001 From: 112madgamer Date: Thu, 22 Nov 2018 20:12:11 +1100 Subject: [PATCH] Mitigate restorenature hanging (#411) Certain parts are disabled. --- .../ryanhamshire/GriefPrevention/PlayerEventHandler.java | 1 - .../GriefPrevention/RestoreNatureExecutionTask.java | 4 ++-- .../GriefPrevention/RestoreNatureProcessingTask.java | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index d8ee8b4..d10e96e 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -2156,7 +2156,6 @@ class PlayerEventHandler implements Listener //figure out which chunk to repair Chunk chunk = player.getWorld().getChunkAt(clickedBlock.getLocation()); - //start the repair process //set boundaries for processing diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureExecutionTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureExecutionTask.java index 84fe486..b5c5f56 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureExecutionTask.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureExecutionTask.java @@ -82,8 +82,8 @@ class RestoreNatureExecutionTask implements Runnable try { - currentBlock.setType(blockUpdate.typeId, false); - currentBlock.setBlockData(blockUpdate.data, false); + currentBlock.setType(blockUpdate.typeId, false); + // currentBlock.setBlockData(blockUpdate.data, false); } catch(IllegalArgumentException e) { diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java index abbb408..4d887cd 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java @@ -149,7 +149,7 @@ class RestoreNatureProcessingTask implements Runnable this.fillHolesAndTrenches(); //fill water depressions and fix unnatural surface ripples - this.fixWater(); + //this.fixWater(); //remove water/lava above sea level this.removeDumpedFluids(); @@ -158,7 +158,7 @@ class RestoreNatureProcessingTask implements Runnable this.coverSurfaceStone(); //remove any player-placed leaves - this.removePlayerLeaves(); + ///this.removePlayerLeaves(); //schedule main thread task to apply the result to the world RestoreNatureExecutionTask task = new RestoreNatureExecutionTask(this.snapshots, this.miny, this.lesserBoundaryCorner, this.greaterBoundaryCorner, this.player); @@ -327,6 +327,7 @@ class RestoreNatureProcessingTask implements Runnable for(int y = miny; y < snapshots[0].length - 1; y++) { BlockSnapshot block = snapshots[x][y][z]; + if(this.playerBlocks.contains(block.typeId)) { block.typeId = Material.AIR; @@ -444,7 +445,7 @@ class RestoreNatureProcessingTask implements Runnable } else { - this.snapshots[x][y][z].typeId = Material.GRASS; + this.snapshots[x][y][z].typeId = Material.GRASS_BLOCK; } } }