From a4892dfa72ebf304a2cca736b7f5a8001950d887 Mon Sep 17 00:00:00 2001 From: feildmaster Date: Thu, 1 Nov 2012 21:11:32 -0500 Subject: [PATCH] Delegate recreateStructures to nms provider. Fixes BUKKIT-2760 This was a miss when updating to 1.4.2 --- .../bukkit/craftbukkit/generator/InternalChunkGenerator.java | 2 +- .../bukkit/craftbukkit/generator/NormalChunkGenerator.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java index b3e7c4b190..19565e52ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/InternalChunkGenerator.java @@ -3,6 +3,6 @@ package org.bukkit.craftbukkit.generator; import net.minecraft.server.IChunkProvider; import org.bukkit.generator.ChunkGenerator; +// Do not implement functions to this class, add to NormalChunkGenerator public abstract class InternalChunkGenerator extends ChunkGenerator implements IChunkProvider { - public void recreateStructures(int i, int j) {} } diff --git a/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java index c5c3346d7f..c24c5247dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/NormalChunkGenerator.java @@ -69,6 +69,11 @@ public class NormalChunkGenerator extends InternalChunkGenerator { return provider.findNearestMapFeature(world, string, i, i1, i2); } + public void recreateStructures(int i, int j) { + provider.recreateStructures(i, j); + } + + // n.m.s implementations always return 0. (The true implementation is in ChunkProviderServer) public int getLoadedChunks() { return 0; }