Browse Source

1.14.4

Signed-off-by: Ryan Fox <flewkey@2a03.party>
master
Ryan Fox 3 years ago
parent
commit
4533e486dc
Signed by: flewkey GPG Key ID: 94F56ADFD848851E
  1. 10
      patches/net/minecraft/server/MinecraftServer.patch
  2. 2
      src/party/_2a03/mc/command/HomeCommand.java
  3. 2
      src/party/_2a03/mc/command/SpawnCommand.java
  4. 2
      src/party/_2a03/mc/server/Config.java
  5. 2
      src/party/_2a03/mc/server/PlayerPosition.java

10
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<TickDelayedTask> 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<Void> optionspec = optionparser.accepts("nogui");
OptionSpec<Void> 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() {

2
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;

2
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;

2
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;

2
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;