1.14.3
This commit is contained in:
parent
cc1f7a0512
commit
959ecf0dd3
@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/command/impl/GameModeCommand.java
|
--- a/net/minecraft/command/impl/GameModeCommand.java
|
||||||
+++ b/net/minecraft/command/impl/GameModeCommand.java
|
+++ b/net/minecraft/command/impl/GameModeCommand.java
|
||||||
@@ -49,6 +49,10 @@
|
@@ -50,6 +50,10 @@
|
||||||
private static int func_198484_a(CommandContext<CommandSource> p_198484_0_, Collection<ServerPlayerEntity> p_198484_1_, GameType p_198484_2_) {
|
private static int func_198484_a(CommandContext<CommandSource> p_198484_0_, Collection<ServerPlayerEntity> p_198484_1_, GameType p_198484_2_) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
@ -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
|
||||||
@@ -118,6 +118,9 @@
|
@@ -119,6 +119,9 @@
|
||||||
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;
|
||||||
@ -10,7 +10,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();
|
||||||
@@ -156,6 +159,7 @@
|
@@ -157,6 +160,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;
|
||||||
@ -18,7 +18,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_);
|
||||||
@@ -167,11 +171,13 @@
|
@@ -168,11 +172,13 @@
|
||||||
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_);
|
||||||
@ -34,7 +34,7 @@
|
|||||||
int i = Math.max(0, this.field_71133_b.func_184108_a(p_205734_1_));
|
int i = Math.max(0, this.field_71133_b.func_184108_a(p_205734_1_));
|
||||||
int j = MathHelper.func_76128_c(p_205734_1_.func_175723_af().func_177729_b((double)blockpos.func_177958_n(), (double)blockpos.func_177952_p()));
|
int j = MathHelper.func_76128_c(p_205734_1_.func_175723_af().func_177729_b((double)blockpos.func_177958_n(), (double)blockpos.func_177952_p()));
|
||||||
if (j < i) {
|
if (j < i) {
|
||||||
@@ -199,7 +205,7 @@
|
@@ -202,7 +208,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -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;
|
||||||
@@ -810,6 +811,7 @@
|
@@ -804,6 +805,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");
|
||||||
@@ -864,7 +866,9 @@
|
@@ -858,7 +860,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();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -950,7 +954,7 @@
|
@@ -944,7 +948,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getServerModName() {
|
public String getServerModName() {
|
||||||
|
Reference in New Issue
Block a user