From 7cb7f31dee74d873d7091cb4a41038010f0c7bba Mon Sep 17 00:00:00 2001 From: Roger Baumgartner Date: Tue, 1 Jan 2013 13:41:07 +0100 Subject: [PATCH 1/2] Update to the newest version of CraftBukkit. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54ff044..b81d4a2 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ org.bukkit craftbukkit - 1.4.2-R0.2 + 1.4.6-R0.3 com.sk89q From 09a0474aa9d529cf9ba00bcaf0b85b17bb481e6f Mon Sep 17 00:00:00 2001 From: Roger Baumgartner Date: Tue, 1 Jan 2013 13:41:39 +0100 Subject: [PATCH 2/2] Fix imports for 1.4.6. --- .../java/me/karlmarx/biomed/BioMedCommandExecutor.java | 4 ---- src/main/java/me/karlmarx/biomed/BioMedUtils.java | 8 ++++---- .../java/me/karlmarx/biomed/GlobalBlockPopulator.java | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/karlmarx/biomed/BioMedCommandExecutor.java b/src/main/java/me/karlmarx/biomed/BioMedCommandExecutor.java index c04e148..eeb54d4 100644 --- a/src/main/java/me/karlmarx/biomed/BioMedCommandExecutor.java +++ b/src/main/java/me/karlmarx/biomed/BioMedCommandExecutor.java @@ -6,10 +6,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; - -import com.sk89q.worldedit.bukkit.WorldEditPlugin; -import com.sk89q.worldedit.regions.Region; public class BioMedCommandExecutor implements CommandExecutor { private final BioMedPlugin plugin; diff --git a/src/main/java/me/karlmarx/biomed/BioMedUtils.java b/src/main/java/me/karlmarx/biomed/BioMedUtils.java index c15c9a5..e1d3f80 100644 --- a/src/main/java/me/karlmarx/biomed/BioMedUtils.java +++ b/src/main/java/me/karlmarx/biomed/BioMedUtils.java @@ -2,14 +2,14 @@ import java.util.Arrays; -import net.minecraft.server.BiomeBase; +import net.minecraft.server.v1_4_6.BiomeBase; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Biome; -import org.bukkit.craftbukkit.CraftChunk; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.v1_4_6.CraftChunk; +import org.bukkit.craftbukkit.v1_4_6.CraftWorld; +import org.bukkit.craftbukkit.v1_4_6.block.CraftBlock; public final class BioMedUtils { diff --git a/src/main/java/me/karlmarx/biomed/GlobalBlockPopulator.java b/src/main/java/me/karlmarx/biomed/GlobalBlockPopulator.java index 76f4f2c..ef10a92 100644 --- a/src/main/java/me/karlmarx/biomed/GlobalBlockPopulator.java +++ b/src/main/java/me/karlmarx/biomed/GlobalBlockPopulator.java @@ -2,12 +2,12 @@ import java.util.Random; -import net.minecraft.server.BiomeBase; +import net.minecraft.server.v1_4_6.BiomeBase; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.block.Biome; -import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.v1_4_6.block.CraftBlock; import org.bukkit.generator.BlockPopulator; public class GlobalBlockPopulator extends BlockPopulator {