Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mitigate restorenature hanging (#411)

Browse Source 
Certain parts are disabled.
This commit is contained in:
112madgamer 2018-11-22 20:12:11 +11:00 committed by RoboMWM
parent 3a9b253401
commit fc7e940cbe
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View File

@ -2156,7 +2156,6 @@ class PlayerEventHandler implements Listener
//figure out which chunk to repair //figure out which chunk to repair
Chunk chunk = player.getWorld().getChunkAt(clickedBlock.getLocation()); Chunk chunk = player.getWorld().getChunkAt(clickedBlock.getLocation());
//start the repair process //start the repair process
//set boundaries for processing //set boundaries for processing

4
src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureExecutionTask.java
View File

@ -82,8 +82,8 @@ class RestoreNatureExecutionTask implements Runnable
try try
{ {
currentBlock.setType(blockUpdate.typeId, false); currentBlock.setType(blockUpdate.typeId, false);
currentBlock.setBlockData(blockUpdate.data, false); // currentBlock.setBlockData(blockUpdate.data, false);
} }
catch(IllegalArgumentException e) catch(IllegalArgumentException e)
{ {

7
src/main/java/me/ryanhamshire/GriefPrevention/RestoreNatureProcessingTask.java
View File

@ -149,7 +149,7 @@ class RestoreNatureProcessingTask implements Runnable
this.fillHolesAndTrenches(); this.fillHolesAndTrenches();
//fill water depressions and fix unnatural surface ripples //fill water depressions and fix unnatural surface ripples
this.fixWater(); //this.fixWater();
//remove water/lava above sea level //remove water/lava above sea level
this.removeDumpedFluids(); this.removeDumpedFluids();
@ -158,7 +158,7 @@ class RestoreNatureProcessingTask implements Runnable
this.coverSurfaceStone(); this.coverSurfaceStone();
//remove any player-placed leaves //remove any player-placed leaves
this.removePlayerLeaves(); ///this.removePlayerLeaves();
//schedule main thread task to apply the result to the world //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); 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++) for(int y = miny; y < snapshots[0].length - 1; y++)
{ {
BlockSnapshot block = snapshots[x][y][z]; BlockSnapshot block = snapshots[x][y][z];
if(this.playerBlocks.contains(block.typeId)) if(this.playerBlocks.contains(block.typeId))
{ {
block.typeId = Material.AIR; block.typeId = Material.AIR;
@ -444,7 +445,7 @@ class RestoreNatureProcessingTask implements Runnable
} }
else else
{ {
this.snapshots[x][y][z].typeId = Material.GRASS; this.snapshots[x][y][z].typeId = Material.GRASS_BLOCK;
} }
} }
} }