diff --git a/nms-patches/net/minecraft/network/NetworkManager.patch b/nms-patches/net/minecraft/network/NetworkManager.patch
index 1d77a8062..3542e1171 100644
--- a/nms-patches/net/minecraft/network/NetworkManager.patch
+++ b/nms-patches/net/minecraft/network/NetworkManager.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/network/NetworkManager.java
 +++ b/net/minecraft/network/NetworkManager.java
-@@ -86,6 +86,7 @@
-     private float averageSentPackets;
-     private int tickCount;
+@@ -88,6 +88,7 @@
      private boolean handlingFault;
+     @Nullable
+     private volatile IChatBaseComponent delayedDisconnect;
 +    public String hostname = ""; // CraftBukkit - add field
  
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.receiving = enumprotocoldirection;
-@@ -167,7 +168,7 @@
+@@ -173,7 +174,7 @@
      }
  
      private static <T extends PacketListener> void genericsFtw(Packet<T> packet, PacketListener packetlistener) {
@@ -17,10 +17,10 @@
      }
  
      public void setListener(PacketListener packetlistener) {
-@@ -296,7 +297,7 @@
+@@ -306,7 +307,7 @@
+         }
  
-     public void disconnect(IChatBaseComponent ichatbasecomponent) {
-         if (this.channel.isOpen()) {
+         if (this.isConnected()) {
 -            this.channel.close().awaitUninterruptibly();
 +            this.channel.close(); // We can't wait as this may be called from an event loop.
              this.disconnectedReason = ichatbasecomponent;
diff --git a/nms-patches/net/minecraft/server/players/PlayerList.patch b/nms-patches/net/minecraft/server/players/PlayerList.patch
index efbe11ab5..4d2e0f487 100644
--- a/nms-patches/net/minecraft/server/players/PlayerList.patch
+++ b/nms-patches/net/minecraft/server/players/PlayerList.patch
@@ -27,7 +27,7 @@
  public abstract class PlayerList {
  
      public static final File USERBANLIST_FILE = new File("banned-players.json");
-@@ -119,32 +139,44 @@
+@@ -119,14 +139,16 @@
      private static final int SEND_PLAYER_INFO_INTERVAL = 600;
      private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
      private final MinecraftServer server;
@@ -47,12 +47,7 @@
      public final WorldNBTStorage playerIo;
      private boolean doWhiteList;
      private final LayeredRegistryAccess<RegistryLayer> registries;
-     private final IRegistryCustom.Dimension synchronizedRegistries;
--    protected final int maxPlayers;
-+    public int maxPlayers;
-     private int viewDistance;
-     private int simulationDistance;
-     private boolean allowCheatsForAllPlayers;
+@@ -138,13 +160,23 @@
      private static final boolean ALLOW_LOGOUTIVATOR = false;
      private int sendAllPlayerInfoIn;
  
diff --git a/nms-patches/net/minecraft/world/entity/Entity.patch b/nms-patches/net/minecraft/world/entity/Entity.patch
index 029ec51f7..1cb796e2e 100644
--- a/nms-patches/net/minecraft/world/entity/Entity.patch
+++ b/nms-patches/net/minecraft/world/entity/Entity.patch
@@ -67,15 +67,6 @@
      private static final Logger LOGGER = LogUtils.getLogger();
      public static final String ID_TAG = "id";
      public static final String PASSENGERS_TAG = "Passengers";
-@@ -190,7 +248,7 @@
-     public boolean noPhysics;
-     protected final RandomSource random;
-     public int tickCount;
--    public int remainingFireTicks;
-+    private int remainingFireTicks;
-     public boolean wasTouchingWater;
-     protected Object2DoubleMap<TagKey<FluidType>> fluidHeight;
-     protected boolean wasEyeInWater;
 @@ -240,6 +298,25 @@
      public boolean hasVisualFire;
      @Nullable
diff --git a/pom.xml b/pom.xml
index e9aeb5908..305118366 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.bukkit</groupId>
     <artifactId>craftbukkit</artifactId>
     <packaging>jar</packaging>
-    <version>1.20-R0.1-SNAPSHOT</version>
+    <version>1.20.1-R0.1-SNAPSHOT</version>
     <name>CraftBukkit</name>
     <url>https://www.spigotmc.org/</url>
 
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 083f09068..31e148ca1 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -239,7 +239,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
      * @return string
      */
     public String getMappingsVersion() {
-        return "34f399b4f2033891290b7f0700e9e47b";
+        return "bcf3dcb22ad42792794079f9443df2c0";
     }
 
     @Override