More 1.14 work

Spigot-Server-Patches/Optional-TNT-doesn-t-move-in-water.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Optional TNT doesn't move in water
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 720b87a5ec..bcc2ecaa3a 100644
+index 805aa5699..92ab55182 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ package com.destroystokyo.paper;
@@ -32,26 +32,27 @@ index 720b87a5ec..bcc2ecaa3a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 462f94ed18..113264981e 100644
+index 3dcd93e5e..b68e2fc04 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
-     public boolean aq() {
+     public boolean au() {
 +        // Paper start
 +        return this.doWaterMovement();
 +    }
 +
 +    public boolean doWaterMovement() {
 +        // Paper end
-         return this.isInWater() || this.q();
+         return this.isInWater() || this.l();
      }
  
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
-     public boolean bw() {
+     public boolean bD() {
++        // Paper start
 +        return this.pushedByWater();
 +    }
 +
@@ -61,12 +62,12 @@ index 462f94ed18..113264981e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 7f4b68dcc0..7a8670323c 100644
+index e0535604b..91e332c3a 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -0,0 +0,0 @@ public class EntityTNTPrimed extends Entity {
-     public int getFuseTicks() {
-         return this.c;
+     public Packet<?> N() {
+         return new PacketPlayOutSpawnEntity(this);
      }
 +
 +    // Paper start - Optional prevent TNT from moving in water