From 959ecf0dd3f65e2051e93cdd2fb0773f6b277248 Mon Sep 17 00:00:00 2001
From: flewkey <flewkey@2a03.party>
Date: Tue, 25 Jun 2019 09:15:10 -0700
Subject: [PATCH] 1.14.3

---
 patches/net/minecraft/command/impl/GameModeCommand.patch  | 2 +-
 .../net/minecraft/entity/player/ServerPlayerEntity.patch  | 8 ++++----
 patches/net/minecraft/server/MinecraftServer.patch        | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/net/minecraft/command/impl/GameModeCommand.patch b/patches/net/minecraft/command/impl/GameModeCommand.patch
index 197ae72..0388513 100644
--- a/patches/net/minecraft/command/impl/GameModeCommand.patch
+++ b/patches/net/minecraft/command/impl/GameModeCommand.patch
@@ -1,6 +1,6 @@
 --- a/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_) {
        int i = 0;
  
diff --git a/patches/net/minecraft/entity/player/ServerPlayerEntity.patch b/patches/net/minecraft/entity/player/ServerPlayerEntity.patch
index d81eb98..93dc73f 100644
--- a/patches/net/minecraft/entity/player/ServerPlayerEntity.patch
+++ b/patches/net/minecraft/entity/player/ServerPlayerEntity.patch
@@ -1,6 +1,6 @@
 --- a/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 org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
@@ -10,7 +10,7 @@
  
  public class ServerPlayerEntity extends PlayerEntity implements IContainerListener {
     private static final Logger field_147102_bM = LogManager.getLogger();
-@@ -156,6 +159,7 @@
+@@ -157,6 +160,7 @@
     public boolean field_71137_h;
     public int field_71138_i;
     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_) {
        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_70138_W = 1.0F;
        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 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) {
-@@ -199,7 +205,7 @@
+@@ -202,7 +208,7 @@
              }
           }
        } else {
diff --git a/patches/net/minecraft/server/MinecraftServer.patch b/patches/net/minecraft/server/MinecraftServer.patch
index 9802dd1..7f72230 100644
--- a/patches/net/minecraft/server/MinecraftServer.patch
+++ b/patches/net/minecraft/server/MinecraftServer.patch
@@ -17,7 +17,7 @@
     private PlayerList field_71318_t;
     private volatile boolean field_71317_u = true;
     private boolean field_71316_v;
-@@ -810,6 +811,7 @@
+@@ -804,6 +805,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");
-@@ -864,7 +866,9 @@
+@@ -858,7 +860,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();
           }
  
-@@ -950,7 +954,7 @@
+@@ -944,7 +948,7 @@
     }
  
     public String getServerModName() {