diff --git a/patches/net/minecraft/server/MinecraftServer.patch b/patches/net/minecraft/server/MinecraftServer.patch index 7f72230..55dc522 100644 --- a/patches/net/minecraft/server/MinecraftServer.patch +++ b/patches/net/minecraft/server/MinecraftServer.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -121,6 +121,7 @@ +@@ -130,6 +130,7 @@ import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -8,7 +8,7 @@ public abstract class MinecraftServer extends RecursiveEventLoop implements ISnooperInfo, ICommandSource, AutoCloseable, Runnable { private static final Logger field_147145_h = LogManager.getLogger(); -@@ -138,7 +139,7 @@ +@@ -148,7 +149,7 @@ private final DataFixer field_184112_s; private String field_71320_r; private int field_71319_s = -1; @@ -17,7 +17,7 @@ private PlayerList field_71318_t; private volatile boolean field_71317_u = true; private boolean field_71316_v; -@@ -804,6 +805,7 @@ +@@ -816,6 +817,7 @@ } public static void main(String[] p_main_0_) { @@ -25,7 +25,7 @@ OptionParser optionparser = new OptionParser(); OptionSpec optionspec = optionparser.accepts("nogui"); OptionSpec optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits"); -@@ -858,7 +860,9 @@ +@@ -870,7 +872,9 @@ dedicatedserver.func_213197_c(optionset.has(optionspec5)); dedicatedserver.func_213208_c(optionset.valueOf(optionspec11)); boolean flag = !optionset.has(optionspec) && !optionset.valuesOf(optionspec12).contains("nogui"); @@ -36,7 +36,7 @@ dedicatedserver.func_120011_ar(); } -@@ -944,7 +948,7 @@ +@@ -956,7 +960,7 @@ } public String getServerModName() { diff --git a/src/party/_2a03/mc/command/HomeCommand.java b/src/party/_2a03/mc/command/HomeCommand.java index ba428f5..898d640 100644 --- a/src/party/_2a03/mc/command/HomeCommand.java +++ b/src/party/_2a03/mc/command/HomeCommand.java @@ -7,7 +7,7 @@ import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import party._2a03.mc.server.Config; import party._2a03.mc.server.PlayerData; import party._2a03.mc.server.PlayerPosition; diff --git a/src/party/_2a03/mc/command/SpawnCommand.java b/src/party/_2a03/mc/command/SpawnCommand.java index 344c096..410d9e5 100644 --- a/src/party/_2a03/mc/command/SpawnCommand.java +++ b/src/party/_2a03/mc/command/SpawnCommand.java @@ -6,7 +6,7 @@ import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import party._2a03.mc.server.Config; import party._2a03.mc.server.PlayerPosition; diff --git a/src/party/_2a03/mc/server/Config.java b/src/party/_2a03/mc/server/Config.java index a5ef11d..2b82dfe 100644 --- a/src/party/_2a03/mc/server/Config.java +++ b/src/party/_2a03/mc/server/Config.java @@ -7,7 +7,7 @@ import java.io.FileInputStream; import java.io.InputStream; import java.util.Map; import net.minecraft.world.dimension.DimensionType; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; import org.json.JSONObject; import org.json.JSONArray; import org.apache.commons.io.IOUtils; diff --git a/src/party/_2a03/mc/server/PlayerPosition.java b/src/party/_2a03/mc/server/PlayerPosition.java index 6144123..2d023f2 100644 --- a/src/party/_2a03/mc/server/PlayerPosition.java +++ b/src/party/_2a03/mc/server/PlayerPosition.java @@ -1,7 +1,7 @@ package party._2a03.mc.server; import org.json.JSONArray; -import net.minecraft.world.ServerWorld; +import net.minecraft.world.server.ServerWorld; public class PlayerPosition { public double x;