even more progress

patches/server-remapped/Avoid-blocking-on-Network-Manager-creation.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Mon, 16 May 2016 23:19:16 -0400
-Subject: [PATCH] Avoid blocking on Network Manager creation
-
-Per Paper issue 294
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConnectionListener.java
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-     public volatile boolean running;
-     private final List<ChannelFuture> channels = Collections.synchronizedList(Lists.newArrayList());
-     private final List<Connection> connections = Collections.synchronizedList(Lists.newArrayList());
-+    // Paper start - prevent blocking on adding a new network manager while the server is ticking
-+    private final java.util.Queue<Connection> pending = new java.util.concurrent.ConcurrentLinkedQueue<>();
-+    private void addPending() {
-+        Connection manager = null;
-+        while ((manager = pending.poll()) != null) {
-+            connections.add(manager);
-+        }
-+    }
-+    // Paper end
- 
-     public ServerConnectionListener(MinecraftServer server) {
-         this.server = server;
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
-                     int j = ServerConnectionListener.this.server.getRateLimitPacketsPerSecond();
-                     Object object = j > 0 ? new RateKickingConnection(j) : new Connection(PacketFlow.SERVERBOUND);
- 
--                    ServerConnectionListener.this.connections.add((Connection) object); // CraftBukkit - decompile error
-+                    //ServerConnection.this.connectedChannels.add((NetworkManager) object); // CraftBukkit - decompile error
-+                    pending.add((Connection) object); // Paper
-                     channel.pipeline().addLast("packet_handler", (ChannelHandler) object);
-                     ((Connection) object).setListener(new ServerHandshakePacketListenerImpl(ServerConnectionListener.this.server, (Connection) object));
-                 }
-@@ -0,0 +0,0 @@ public class ServerConnectionListener {
- 
-         synchronized (this.connections) {
-             // Spigot Start
-+            this.addPending(); // Paper
-             // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
-             if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
-             {

patches/server-remapped/Per-Player-View-Distance-API-placeholders.patch

@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Mon, 6 May 2019 01:29:25 -0400
-Subject: [PATCH] Per-Player View Distance API placeholders
-
-I hope to look at this more in-depth soon. It appears doable.
-However this should not block the update.
-
-diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -0,0 +0,0 @@ public class EnderDragon extends Mob implements Enemy {
-             if (this.dragonDeathTime == 1 && !this.isSilent()) {
-                 // CraftBukkit start - Use relative location for far away sounds
-                 // this.world.b(1028, this.getChunkCoordinates(), 0);
--                //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-+                int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-                 for (net.minecraft.server.level.ServerPlayer player : (List<net.minecraft.server.level.ServerPlayer>) ((ServerLevel)level).players()) {
--                    final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-+                    // final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-+                    // Paper end
-                     double deltaX = this.getX() - player.getX();
-                     double deltaZ = this.getZ() - player.getZ();
-                     double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
-diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -0,0 +0,0 @@ import net.minecraft.network.syncher.EntityDataSerializers;
- import net.minecraft.network.syncher.SynchedEntityData;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerBossEvent;
-+import net.minecraft.server.level.ServerLevel;
- import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.sounds.SoundEvent;
- import net.minecraft.sounds.SoundEvents;
-@@ -0,0 +0,0 @@ public class WitherBoss extends Monster implements RangedAttackMob {
-                 if (!this.isSilent()) {
-                     // CraftBukkit start - Use relative location for far away sounds
-                     // this.world.b(1023, new BlockPosition(this), 0);
--                    //int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-+                    int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API
-                     for (ServerPlayer player : (List<ServerPlayer>)this.level.players()) {
--                        final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-+                        // final int viewDistance = player.getViewDistance(); // TODO apply view distance api patch
-                         double deltaX = this.getX() - player.getX();
-                         double deltaZ = this.getZ() - player.getZ();
-                         double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-             super.remove();
-         }
-     }
-+
-+    @Override
-+    public int getViewDistance() {
-+        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
-+    }
-+
-+    @Override
-+    public void setViewDistance(int viewDistance) {
-+        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
-+    }
-     // Paper end
- 
-     // Spigot start

patches/server/Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -23,10 +23,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java
 @@ -0,0 +0,0 @@ public class ScoreboardSaveData extends SavedData {
+         ListTag listTag = new ListTag();
  
-         while (iterator.hasNext()) {
+         for(PlayerTeam playerTeam : this.scoreboard.getPlayerTeams()) {
-             PlayerTeam scoreboardteam = (PlayerTeam) iterator.next();
++            if (!com.destroystokyo.paper.PaperConfig.saveEmptyScoreboardTeams && playerTeam.getPlayers().isEmpty()) continue; // Paper
-+            if (!com.destroystokyo.paper.PaperConfig.saveEmptyScoreboardTeams && scoreboardteam.getPlayers().isEmpty()) continue; // Paper
+             CompoundTag compoundTag = new CompoundTag();
-             CompoundTag nbttagcompound = new CompoundTag();
+             compoundTag.putString("Name", playerTeam.getName());
- 
+             compoundTag.putString("DisplayName", Component.Serializer.toJson(playerTeam.getDisplayName()));
-             nbttagcompound.putString("Name", scoreboardteam.getName());

patches/server/Faster-redstone-torch-rapid-clock-removal.patch

@@ -9,19 +9,11 @@ diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.biome.BiomeManager;
- import net.minecraft.world.level.block.BaseFireBlock;
- import net.minecraft.world.level.block.Block;
- import net.minecraft.world.level.block.Blocks;
-+import net.minecraft.world.level.block.RedstoneTorchBlock;
- import net.minecraft.world.level.block.entity.BlockEntity;
- import net.minecraft.world.level.block.entity.BlockEntityType;
- import net.minecraft.world.level.block.entity.TickableBlockEntity;
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      private org.spigotmc.TickLimiter tileLimiter;
      private int tileTickPosition;
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
-+    public java.util.ArrayDeque<RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
++    public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
      public CraftWorld getWorld() {
          return this.world;
@@ -35,9 +27,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static final BooleanProperty LIT = BlockStateProperties.LIT;
 -    private static final Map<BlockGetter, List<RedstoneTorchBlock.Toggle>> RECENT_TOGGLES = new WeakHashMap();
 +    // Paper - Move the mapped list to World
- 
+     public static final int RECENT_TOGGLE_TIMER = 60;
-     protected RedstoneTorchBlock(BlockBehaviour.Properties settings) {
+     public static final int MAX_RECENT_TOGGLES = 8;
-         super(settings, DustParticleOptions.REDSTONE);
+     public static final int RESTART_DELAY = 160;
 @@ -0,0 +0,0 @@ public class RedstoneTorchBlock extends TorchBlock {
      @Override
      public void tick(BlockState state, ServerLevel world, BlockPos pos, Random random) {
@@ -50,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        java.util.ArrayDeque<RedstoneTorchBlock.Toggle> redstoneUpdateInfos = world.redstoneUpdateInfos;
 +        if (redstoneUpdateInfos != null) {
 +            RedstoneTorchBlock.Toggle curr;
-+            while ((curr = redstoneUpdateInfos.peek()) != null && world.getGameTime() - curr.getTime() > 60L) {
++            while ((curr = redstoneUpdateInfos.peek()) != null && world.getGameTime() - curr.when > 60L) {
 +                redstoneUpdateInfos.poll();
 +            }
          }
@@ -87,12 +79,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              if (blockredstonetorch_redstoneupdateinfo.pos.equals(pos)) {
                  ++i;
                  if (i >= 8) {
-@@ -0,0 +0,0 @@ public class RedstoneTorchBlock extends TorchBlock {
-     public static class Toggle {
- 
-         private final BlockPos pos;
--        private final long when;
-+        private final long when; final long getTime() { return this.when; } // Paper - OBFHELPER
- 
-         public Toggle(BlockPos pos, long time) {
-             this.pos = pos;

patches/server/LootTable-API-Replenishable-Lootables-Feature.patch

@@ -88,7 +88,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@
 +package com.destroystokyo.paper.loottable;
 +
-+import LootableInventory;
 +import net.minecraft.world.level.Level;
 +import org.bukkit.entity.Entity;
 +

patches/server/Only-send-Dragon-Wither-Death-sounds-to-same-world.patch

@@ -25,15 +25,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -0,0 +0,0 @@ import net.minecraft.network.syncher.EntityDataSerializers;
+@@ -0,0 +0,0 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
- import net.minecraft.network.syncher.SynchedEntityData;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ServerBossEvent;
--import net.minecraft.server.level.ServerLevel;
- import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.sounds.SoundEvent;
- import net.minecraft.sounds.SoundEvents;
-@@ -0,0 +0,0 @@ public class WitherBoss extends Monster implements RangedAttackMob {
                  if (!this.isSilent()) {
                      // CraftBukkit start - Use relative location for far away sounds
                      // this.world.b(1023, new BlockPosition(this), 0);

patches/server/Optimize-UserCache-Thread-Safe.patch

@@ -9,6 +9,8 @@ easier to do this than replace the entire thing.
 Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
+1.17: TODO does this need the synchronized blocks anymore?
+
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -16,9 +18,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } catch (java.lang.InterruptedException ignored) {} // Paper
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
-             LOGGER.info("Saving usercache.json");
+             MinecraftServer.LOGGER.info("Saving usercache.json");
 -            this.getProfileCache().save();
-+            this.getProfileCache().b(false); // Paper
++            this.getProfileCache().save(false); // Paper
          }
          // Spigot end
  
@@ -31,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          if (this.convertOldUsers()) {
 -            this.getProfileCache().save();
-+            this.getProfileCache().b(false); // Paper
++            this.getProfileCache().save(false); // Paper
          }
  
          if (!OldUsersConverter.serverReadyAfterUserconversion(this)) {
@@ -39,29 +41,21 @@ diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java
 +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java
-@@ -0,0 +0,0 @@ import java.util.concurrent.atomic.AtomicLong;
- import java.util.concurrent.atomic.AtomicReference;
- import java.util.stream.Stream;
- import javax.annotation.Nullable;
-+import net.minecraft.server.MCUtil;
- import net.minecraft.world.entity.player.Player;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
 @@ -0,0 +0,0 @@ public class GameProfileCache {
          return GameProfileCache.usesAuthentication;
      }
  
--    public void add(GameProfile gameprofile) {
+-    public void add(GameProfile profile) {
-+    public synchronized void add(GameProfile gameprofile) { // Paper - synchronize
++    public synchronized void add(GameProfile profile) { // Paper - synchronize
          Calendar calendar = Calendar.getInstance();
  
          calendar.setTime(new Date());
 @@ -0,0 +0,0 @@ public class GameProfileCache {
-         GameProfileCache.GameProfileInfo usercache_usercacheentry = new GameProfileCache.GameProfileInfo(gameprofile, date);
+         GameProfileCache.GameProfileInfo usercache_usercacheentry = new GameProfileCache.GameProfileInfo(profile, date);
  
          this.safeAdd(usercache_usercacheentry);
 -        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(); // Spigot - skip saving if disabled
-+        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.b(true); // Spigot - skip saving if disabled // Paper - async
++        if( !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly ) this.save(true); // Spigot - skip saving if disabled // Paper - async
      }
  
      private long getNextOperation() {
@@ -69,8 +63,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      @Nullable
--    public GameProfile get(String s) {
+-    public GameProfile getProfile(String s) {
-+    public synchronized GameProfile get(String s) { // Paper - synchronize
++    public synchronized GameProfile getProfile(String s) { // Paper - synchronize
          String s1 = s.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
          boolean flag = false;
@@ -79,7 +73,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
          if (flag && !org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { // Spigot - skip saving if disabled
 -            this.save();
-+            this.b(true); // Paper
++            this.save(true); // Paper
          }
  
          return gameprofile;
@@ -88,12 +82,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
 -    public void save() {
-+    public void b(boolean asyncSave) { // Paper
++    public void save(boolean asyncSave) { // Paper
          JsonArray jsonarray = new JsonArray();
-         DateFormat dateformat = createDateFormat();
+         DateFormat dateformat = GameProfileCache.createDateFormat();
  
 @@ -0,0 +0,0 @@ public class GameProfileCache {
-             jsonarray.add(writeGameProfile(usercache_usercacheentry, dateformat));
+             jsonarray.add(GameProfileCache.writeGameProfile(usercache_usercacheentry, dateformat));
          });
          String s = this.gson.toJson(jsonarray);
 +        Runnable save = () -> { // Paper
@@ -107,7 +101,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start
 +        };
 +        if (asyncSave) {
-+            MCUtil.scheduleAsyncTask(save);
++            net.minecraft.server.MCUtil.scheduleAsyncTask(save);
 +        } else {
 +            save.run();
 +        }

patches/server/Optional-TNT-doesn-t-move-in-water.patch

@@ -8,14 +8,6 @@ diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/m
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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;
- 
- import java.util.List;
- 
--import org.bukkit.Bukkit;
- import org.bukkit.configuration.file.YamlConfiguration;
- import org.spigotmc.SpigotWorldConfig;
- 
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
              );
          }
@@ -39,67 +31,36 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private boolean wasRiding;
      private boolean wasOnGround;
      // CraftBukkit start
--    private final Set<ServerPlayer> trackedPlayers;
+-    private final Set<ServerPlayerConnection> trackedPlayers;
-+    final Set<ServerPlayer> trackedPlayers; // Paper - private -> package
++    final Set<ServerPlayerConnection> trackedPlayers; // Paper - private -> package
-     // Paper start
-     private java.util.Map<ServerPlayer, Boolean> trackedPlayerMap = null;
- 
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
-     }
- 
-     public boolean isPushedByFluid() {
-+        // Paper start
-+        return this.pushedByWater();
-+    }
-+    public boolean pushedByWater() {
-+        // Paper end
-         return true;
-     }
  
+     public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
+         this.trackedPlayers = trackedPlayers;
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-@@ -0,0 +0,0 @@ import net.minecraft.core.particles.ParticleTypes;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.network.protocol.Packet;
- import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
-+import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
-+import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
- import net.minecraft.network.syncher.EntityDataAccessor;
- import net.minecraft.network.syncher.EntityDataSerializers;
- import net.minecraft.network.syncher.SynchedEntityData;
-+import net.minecraft.server.level.ChunkMap;
-+import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityDimensions;
- import net.minecraft.world.entity.EntityType;
 @@ -0,0 +0,0 @@ public class PrimedTnt extends Entity {
-                 this.level.addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
              }
          }
--
+ 
 +        // Paper start - Optional prevent TNT from moving in water
-+        if (!this.removed && this.wasTouchingWater && this.level.paperConfig.preventTntFromMovingInWater) {
++        if (!this.isRemoved() && this.wasTouchingWater && this.level.paperConfig.preventTntFromMovingInWater) {
 +            /*
 +             * Author: Jedediah Smith <jedediah@silencegreys.com>
 +             */
 +            // Send position and velocity updates to nearby players on every tick while the TNT is in water.
 +            // This does pretty well at keeping their clients in sync with the server.
-+            ChunkMap.TrackedEntity ete = ((ServerLevel)this.level).getChunkSource().chunkMap.entityMap.get(this.getId());
++            net.minecraft.server.level.ChunkMap.TrackedEntity ete = ((net.minecraft.server.level.ServerLevel)this.level).getChunkSource().chunkMap.entityMap.get(this.getId());
 +            if (ete != null) {
-+                ClientboundSetEntityMotionPacket velocityPacket = new ClientboundSetEntityMotionPacket(this);
++                net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
-+                ClientboundTeleportEntityPacket positionPacket = new ClientboundTeleportEntityPacket(this);
++                net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = new net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket(this);
 +
 +                ete.seenBy.stream()
-+                    .filter(viewer -> (viewer.getX() - this.getX()) * (viewer.getY() - this.getY()) * (viewer.getZ() - this.getZ()) < 16 * 16)
++                    .filter(viewer -> (viewer.getPlayer().getX() - this.getX()) * (viewer.getPlayer().getY() - this.getY()) * (viewer.getPlayer().getZ() - this.getZ()) < 16 * 16)
 +                    .forEach(viewer -> {
-+                        viewer.connection.send(velocityPacket);
++                        viewer.send(velocityPacket);
-+                        viewer.connection.send(positionPacket);
++                        viewer.send(positionPacket);
 +                    });
 +            }
 +        }
@@ -114,8 +75,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    // Paper start - Optional prevent TNT from moving in water
 +    @Override
-+    public boolean pushedByWater() {
++    public boolean isPushedByFluid() {
-+        return !level.paperConfig.preventTntFromMovingInWater && super.pushedByWater();
++        return !level.paperConfig.preventTntFromMovingInWater && super.isPushedByFluid();
 +    }
 +    // Paper end
  }

patches/server/Per-Player-View-Distance-API-placeholders.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Mon, 6 May 2019 01:29:25 -0400
+Subject: [PATCH] Per-Player View Distance API placeholders
+
+I hope to look at this more in-depth soon. It appears doable.
+However this should not block the update.
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
+ 
+ public class ServerPlayer extends Player {
+ 
++    public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder
++
+     private static final Logger LOGGER = LogManager.getLogger();
+     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
+     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+             connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
+         }
+     }
++
++    @Override
++    public int getViewDistance() {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
++
++    @Override
++    public void setViewDistance(int viewDistance) {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
+     // Paper end
+ 
+     @Override

patches/server/System-property-for-disabling-watchdoge.patch

@@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -0,0 +0,0 @@ public class WatchdogThread extends Thread
-         while ( !stopping )
+         while ( !this.stopping )
          {
              //
--            if ( lastTick != 0 && timeoutTime > 0 && monotonicMillis() > lastTick + timeoutTime )
+-            if ( this.lastTick != 0 && this.timeoutTime > 0 && WatchdogThread.monotonicMillis() > this.lastTick + this.timeoutTime )
-+            if ( lastTick != 0 && timeoutTime > 0 && monotonicMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
++            if ( this.lastTick != 0 && this.timeoutTime > 0 && WatchdogThread.monotonicMillis() > this.lastTick + this.timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
              {
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "------------------------------" );