1.15
Signed-off-by: flewkey <flewkey@2a03.party>
This commit is contained in:
parent
3c6ef632ea
commit
ff60795d2b
@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/command/Commands.java
|
--- a/net/minecraft/command/Commands.java
|
||||||
+++ b/net/minecraft/command/Commands.java
|
+++ b/net/minecraft/command/Commands.java
|
||||||
@@ -90,6 +90,9 @@
|
@@ -96,6 +96,9 @@
|
||||||
import net.minecraft.util.text.event.HoverEvent;
|
import net.minecraft.util.text.event.HoverEvent;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
public class Commands {
|
public class Commands {
|
||||||
private static final Logger field_197061_a = LogManager.getLogger();
|
private static final Logger field_197061_a = LogManager.getLogger();
|
||||||
@@ -149,6 +152,9 @@
|
@@ -156,6 +159,9 @@
|
||||||
TriggerCommand.func_198852_a(this.field_197062_b);
|
TriggerCommand.func_198852_a(this.field_197062_b);
|
||||||
WeatherCommand.func_198862_a(this.field_197062_b);
|
WeatherCommand.func_198862_a(this.field_197062_b);
|
||||||
WorldBorderCommand.func_198894_a(this.field_197062_b);
|
WorldBorderCommand.func_198894_a(this.field_197062_b);
|
||||||
+ SpawnCommand.register(this.field_197062_b); //Patched
|
+ SpawnCommand.register(this.field_197062_b); //Patched
|
||||||
+ HomeCommand.register(this.field_197062_b); //Patched
|
+ HomeCommand.register(this.field_197062_b); //Patched
|
||||||
+ ConfigCommand.register(this.field_197062_b); //Patched
|
+ ConfigCommand.register(this.field_197062_b); //Patched
|
||||||
if (p_i49161_1_) {
|
if (SharedConstants.field_206244_b) {
|
||||||
BanIpCommand.func_198220_a(this.field_197062_b);
|
TestCommand.func_229613_a_(this.field_197062_b);
|
||||||
BanListCommand.func_198229_a(this.field_197062_b);
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/entity/player/ServerPlayerEntity.java
|
--- a/net/minecraft/entity/player/ServerPlayerEntity.java
|
||||||
+++ b/net/minecraft/entity/player/ServerPlayerEntity.java
|
+++ b/net/minecraft/entity/player/ServerPlayerEntity.java
|
||||||
@@ -119,6 +119,8 @@
|
@@ -115,6 +115,8 @@
|
||||||
import net.minecraft.world.storage.WorldInfo;
|
import net.minecraft.world.storage.WorldInfo;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
public class ServerPlayerEntity extends PlayerEntity implements IContainerListener {
|
public class ServerPlayerEntity extends PlayerEntity implements IContainerListener {
|
||||||
private static final Logger field_147102_bM = LogManager.getLogger();
|
private static final Logger field_147102_bM = LogManager.getLogger();
|
||||||
@@ -157,6 +159,7 @@
|
@@ -153,6 +155,7 @@
|
||||||
public boolean field_71137_h;
|
public boolean field_71137_h;
|
||||||
public int field_71138_i;
|
public int field_71138_i;
|
||||||
public boolean field_71136_j;
|
public boolean field_71136_j;
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
public ServerPlayerEntity(MinecraftServer p_i45285_1_, ServerWorld p_i45285_2_, GameProfile p_i45285_3_, PlayerInteractionManager p_i45285_4_) {
|
public ServerPlayerEntity(MinecraftServer p_i45285_1_, ServerWorld p_i45285_2_, GameProfile p_i45285_3_, PlayerInteractionManager p_i45285_4_) {
|
||||||
super(p_i45285_2_, p_i45285_3_);
|
super(p_i45285_2_, p_i45285_3_);
|
||||||
@@ -168,6 +171,7 @@
|
@@ -164,6 +167,7 @@
|
||||||
this.field_192042_bX = p_i45285_1_.func_184103_al().func_192054_h(this);
|
this.field_192042_bX = p_i45285_1_.func_184103_al().func_192054_h(this);
|
||||||
this.field_70138_W = 1.0F;
|
this.field_70138_W = 1.0F;
|
||||||
this.func_205734_a(p_i45285_2_);
|
this.func_205734_a(p_i45285_2_);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/server/MinecraftServer.java
|
--- a/net/minecraft/server/MinecraftServer.java
|
||||||
+++ b/net/minecraft/server/MinecraftServer.java
|
+++ b/net/minecraft/server/MinecraftServer.java
|
||||||
@@ -130,6 +130,7 @@
|
@@ -135,6 +135,7 @@
|
||||||
import org.apache.commons.lang3.Validate;
|
import org.apache.commons.lang3.Validate;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public abstract class MinecraftServer extends RecursiveEventLoop<TickDelayedTask> implements ISnooperInfo, ICommandSource, AutoCloseable, Runnable {
|
public abstract class MinecraftServer extends RecursiveEventLoop<TickDelayedTask> implements ISnooperInfo, ICommandSource, AutoCloseable, Runnable {
|
||||||
private static final Logger field_147145_h = LogManager.getLogger();
|
private static final Logger field_147145_h = LogManager.getLogger();
|
||||||
@@ -148,7 +149,7 @@
|
@@ -153,7 +154,7 @@
|
||||||
private final DataFixer field_184112_s;
|
private final DataFixer field_184112_s;
|
||||||
private String field_71320_r;
|
private String field_71320_r;
|
||||||
private int field_71319_s = -1;
|
private int field_71319_s = -1;
|
||||||
@ -17,7 +17,7 @@
|
|||||||
private PlayerList field_71318_t;
|
private PlayerList field_71318_t;
|
||||||
private volatile boolean field_71317_u = true;
|
private volatile boolean field_71317_u = true;
|
||||||
private boolean field_71316_v;
|
private boolean field_71316_v;
|
||||||
@@ -816,6 +817,7 @@
|
@@ -832,6 +833,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] p_main_0_) {
|
public static void main(String[] p_main_0_) {
|
||||||
@ -25,7 +25,7 @@
|
|||||||
OptionParser optionparser = new OptionParser();
|
OptionParser optionparser = new OptionParser();
|
||||||
OptionSpec<Void> optionspec = optionparser.accepts("nogui");
|
OptionSpec<Void> optionspec = optionparser.accepts("nogui");
|
||||||
OptionSpec<Void> optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
|
OptionSpec<Void> optionspec1 = optionparser.accepts("initSettings", "Initializes 'server.properties' and 'eula.txt', then quits");
|
||||||
@@ -870,7 +872,9 @@
|
@@ -886,7 +888,9 @@
|
||||||
dedicatedserver.func_213197_c(optionset.has(optionspec5));
|
dedicatedserver.func_213197_c(optionset.has(optionspec5));
|
||||||
dedicatedserver.func_213208_c(optionset.valueOf(optionspec11));
|
dedicatedserver.func_213208_c(optionset.valueOf(optionspec11));
|
||||||
boolean flag = !optionset.has(optionspec) && !optionset.valuesOf(optionspec12).contains("nogui");
|
boolean flag = !optionset.has(optionspec) && !optionset.valuesOf(optionspec12).contains("nogui");
|
||||||
@ -36,7 +36,7 @@
|
|||||||
dedicatedserver.func_120011_ar();
|
dedicatedserver.func_120011_ar();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -956,7 +960,7 @@
|
@@ -972,7 +976,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getServerModName() {
|
public String getServerModName() {
|
||||||
|
@ -27,9 +27,9 @@ public class HomeCommand {
|
|||||||
literalargumentbuilder.then(Commands.func_197057_a("set").executes((source) -> {
|
literalargumentbuilder.then(Commands.func_197057_a("set").executes((source) -> {
|
||||||
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
||||||
PlayerData player = playerEntity.player_data;
|
PlayerData player = playerEntity.player_data;
|
||||||
double x = playerEntity.field_70165_t;
|
double x = playerEntity.func_226277_ct_();
|
||||||
double y = playerEntity.field_70163_u;
|
double y = playerEntity.func_226278_cu_();
|
||||||
double z = playerEntity.field_70161_v;
|
double z = playerEntity.func_226281_cx_();
|
||||||
float yaw = playerEntity.field_70177_z;
|
float yaw = playerEntity.field_70177_z;
|
||||||
float pitch = playerEntity.field_70125_A;
|
float pitch = playerEntity.field_70125_A;
|
||||||
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
||||||
@ -44,9 +44,9 @@ public class HomeCommand {
|
|||||||
}).then(Commands.func_197056_a("UUID", StringArgumentType.word()).executes((source) -> {
|
}).then(Commands.func_197056_a("UUID", StringArgumentType.word()).executes((source) -> {
|
||||||
PlayerData player = Config.getPlayer(StringArgumentType.getString(source, "UUID"));
|
PlayerData player = Config.getPlayer(StringArgumentType.getString(source, "UUID"));
|
||||||
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
||||||
double x = playerEntity.field_70165_t;
|
double x = playerEntity.func_226277_ct_();
|
||||||
double y = playerEntity.field_70163_u;
|
double y = playerEntity.func_226278_cu_();
|
||||||
double z = playerEntity.field_70161_v;
|
double z = playerEntity.func_226281_cx_();
|
||||||
float yaw = playerEntity.field_70177_z;
|
float yaw = playerEntity.field_70177_z;
|
||||||
float pitch = playerEntity.field_70125_A;
|
float pitch = playerEntity.field_70125_A;
|
||||||
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
||||||
|
@ -30,9 +30,9 @@ public class SpawnCommand {
|
|||||||
return source.func_197034_c(2);
|
return source.func_197034_c(2);
|
||||||
}).executes((source) -> {
|
}).executes((source) -> {
|
||||||
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
ServerPlayerEntity playerEntity = source.getSource().func_197035_h();
|
||||||
double x = playerEntity.field_70165_t;
|
double x = playerEntity.func_226277_ct_();
|
||||||
double y = playerEntity.field_70163_u;
|
double y = playerEntity.func_226278_cu_();
|
||||||
double z = playerEntity.field_70161_v;
|
double z = playerEntity.func_226281_cx_();
|
||||||
float yaw = playerEntity.field_70177_z;
|
float yaw = playerEntity.field_70177_z;
|
||||||
float pitch = playerEntity.field_70125_A;
|
float pitch = playerEntity.field_70125_A;
|
||||||
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
ServerWorld world = (ServerWorld)playerEntity.field_70170_p;
|
||||||
|
Reference in New Issue
Block a user