diff --git a/paper-server/pom.xml b/paper-server/pom.xml old mode 100755 new mode 100644 diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java index 8f75338699..9212bad9ce 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftLivingEntity.java @@ -7,7 +7,7 @@ import org.bukkit.LivingEntity; public class CraftLivingEntity extends CraftEntity implements LivingEntity { private EntityLiving entity; - + public CraftLivingEntity(final CraftServer server, final EntityLiving entity) { super(server, entity); this.entity = entity; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 1fe1ee4473..086343f8b3 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1,15 +1,12 @@ - package org.bukkit.craftbukkit; import java.io.File; -import java.util.HashMap; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.server.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.server.ServerConfigurationManager; -import net.minecraft.server.WorldServer; import org.bukkit.*; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.SimplePluginManager; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 5e6d20d7ec..322065f265 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -16,7 +16,7 @@ public class CraftWorld implements World { public CraftWorld(WorldServer world) { this.world = world; } - + public Block getBlockAt(int x, int y, int z) { BlockCoordinate loc = new BlockCoordinate(x, y, z); Block block = blockCache.get(loc); @@ -78,7 +78,7 @@ public class CraftWorld implements World { private final class ChunkCoordinate { public final int x; public final int z; - + public ChunkCoordinate(final int x, final int z) { this.x = x; this.z = z; @@ -115,7 +115,7 @@ public class CraftWorld implements World { public final int x; public final int y; public final int z; - + public BlockCoordinate(final int x, final int y, final int z) { this.x = x; this.y = y; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java index d2543b5e19..786e56d840 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java @@ -6,7 +6,7 @@ import net.minecraft.server.MinecraftServer; public class Main { public static void main(String[] args) { // Todo: Installation script - + try { MinecraftServer.main(args); } catch (Throwable t) {