more renames

Author: Lulu13022002

…anager-and-add-advanced-packet-sup.patch …on-and-add-advanced-packet-support.patchpaper-server/patches/features/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch renamed to paper-server/patches/features/0001-Optimize-Connection-and-add-advanced-packet-support.patch paper-server/patches/features/0001-Optimize-Network-Manager-and-add-advanced-packet-sup.patch renamed to paper-server/patches/features/0001-Optimize-Connection-and-add-advanced-packet-support.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 May 2020 04:53:35 -0400
-Subject: [PATCH] Optimize Network Manager and add advanced packet support
+Subject: [PATCH] Optimize Connection and add advanced packet support
 
 Adds ability for 1 packet to bundle other packets to follow it
 Adds ability for a packet to delay sending more packets until a state is ready.
@@ -28,7 +28,7 @@ and then catch exceptions and close if they fire.
 Part of this commit was authored by: Spottedleaf, sandtechnology
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 6fb9eb8078e934d3d610ec58f58e0a47bc3437b8..8e6d1cc768edff5ed555dea7843156113558954a 100644
+index 6fb9eb8078e934d3d610ec58f58e0a47bc3437b8..d65a8f0cc7386270471338454d35c52bdbcd8e82 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -65,7 +65,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -102,37 +102,34 @@ index 6fb9eb8078e934d3d610ec58f58e0a47bc3437b8..8e6d1cc768edff5ed555dea784315611
          }
      }
 
-@@ -419,22 +450,42 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
-         }
+@@ -420,21 +451,41 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
      }
 
--    private void doSendPacket(final Packet<?> packet, final @Nullable ChannelFutureListener listener, final boolean flush) {
-+    private void doSendPacket(final Packet<?> packet, @Nullable final ChannelFutureListener listener, final boolean flush) {
+     private void doSendPacket(final Packet<?> packet, final @Nullable ChannelFutureListener listener, final boolean flush) {
 +        // Paper start - Optimize network
 +        final net.minecraft.server.level.ServerPlayer player = this.getPlayer();
 +        if (!this.isConnected()) {
 +            packet.onPacketDispatchFinish(player, null);
 +            return;
 +        }
 +        try {
-+        final ChannelFuture channelFuture;
++        final ChannelFuture future;
 +        // Paper end - Optimize network
          if (listener != null) {
 -            ChannelFuture future = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet);
--            future.addListener(listener);
-+            channelFuture = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet); // Paper - Optimize network
-+            channelFuture.addListener(listener);
++            future = flush ? this.channel.writeAndFlush(packet) : this.channel.write(packet); // Paper - Optimize network
+             future.addListener(listener);
          } else if (flush) {
 -            this.channel.writeAndFlush(packet, this.channel.voidPromise());
-+            channelFuture = this.channel.writeAndFlush(packet, this.channel.voidPromise()); // Paper - Optimize network
++            future = this.channel.writeAndFlush(packet, this.channel.voidPromise()); // Paper - Optimize network
          } else {
 -            this.channel.write(packet, this.channel.voidPromise());
-+            channelFuture = this.channel.write(packet, this.channel.voidPromise()); // Paper - Optimize network
++            future = this.channel.write(packet, this.channel.voidPromise()); // Paper - Optimize network
 +        }
 +
 +        // Paper start - Optimize network
 +        if (packet.hasFinishListener()) {
-+            channelFuture.addListener((ChannelFutureListener) future -> packet.onPacketDispatchFinish(player, future));
++            future.addListener((ChannelFutureListener) f -> packet.onPacketDispatchFinish(player, f));
 +        }
 +        } catch (final Exception e) {
 +            LOGGER.error("NetworkException: {}", player, e);
@@ -282,8 +279,8 @@ index 6fb9eb8078e934d3d610ec58f58e0a47bc3437b8..8e6d1cc768edff5ed555dea784315611
 +            }
 +        }
 +
-+        private static boolean canSendImmediate(final Connection networkManager, final net.minecraft.network.protocol.Packet<?> packet) {
-+            return networkManager.isPending || networkManager.packetListener.protocol() != ConnectionProtocol.PLAY ||
++        private static boolean canSendImmediate(final Connection connection, final net.minecraft.network.protocol.Packet<?> packet) {
++            return connection.isPending || connection.packetListener.protocol() != ConnectionProtocol.PLAY ||
 +                packet instanceof net.minecraft.network.protocol.common.ClientboundKeepAlivePacket ||
 +                packet instanceof net.minecraft.network.protocol.game.ClientboundPlayerChatPacket ||
 +                packet instanceof net.minecraft.network.protocol.game.ClientboundSystemChatPacket ||
@@ -375,7 +372,7 @@ index 1480d0db90f5797e3dee19503e52d1e783493ac3..f6cfce2ce30a426cd57a89f3f8ccf144
 +    // Paper end
  }
 diff --git a/net/minecraft/server/network/ServerConnectionListener.java b/net/minecraft/server/network/ServerConnectionListener.java
-index d59f367a2a93a30b7cd28d3ac0252ca74bf94b28..ea7512ac3866d4d02502a78c32e35ebc186b3838 100644
+index e72bd8239eed69be774373b49cdb05fbf0799030..22276be80b8729884c797b96c93bf0965ca9eed1 100644
 --- a/net/minecraft/server/network/ServerConnectionListener.java
 +++ b/net/minecraft/server/network/ServerConnectionListener.java
 @@ -51,11 +51,13 @@ public class ServerConnectionListener {

paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch

@@ -415,7 +415,7 @@ index 0b064125d562bd0904321bdc4d4a243042a9bea8..c164f98c5b92e5f326a8f7b5e2840039
          }
      }
 diff --git a/net/minecraft/world/entity/AgeableMob.java b/net/minecraft/world/entity/AgeableMob.java
-index 4f98f6e1ca266ab7377fb52e753b977d4ccd1558..009b4e972fd1d8ce224131f1ed90e416d119d44e 100644
+index 4f98f6e1ca266ab7377fb52e753b977d4ccd1558..a0c930afcdb01e2fb103836613417fb9fc96d86b 100644
 --- a/net/minecraft/world/entity/AgeableMob.java
 +++ b/net/minecraft/world/entity/AgeableMob.java
 @@ -184,6 +184,21 @@ public abstract class AgeableMob extends PathfinderMob {
@@ -426,9 +426,9 @@ index 4f98f6e1ca266ab7377fb52e753b977d4ccd1558..009b4e972fd1d8ce224131f1ed90e416
 +    @Override
 +    public void inactiveTick() {
 +        super.inactiveTick();
-+        if (!this.isAgeLocked() && this.isAlive()) {
++        if (this.isAlive()) {
 +            int age = this.getAge();
-+            if (age < 0) {
++            if (this.canAgeUp()) {
 +                this.setAge(++age);
 +            } else if (age > 0) {
 +                this.setAge(--age);
@@ -521,7 +521,7 @@ index 931a886ab969009c1dc672e3108a0e65f888e0f4..83602c8ee3e2d6064fea66a915f427ff
              delta = this.maybeBackOffFromEdge(delta, moverType);
              Vec3 movement = this.collide(delta);
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 12c8c0251bf884f468a9a7c8dc4a085747a766b3..a805548fe67c3bf2d3d13830fa1f56b79aa17b72 100644
+index e0e6c0f1ab9609fb64db4dfd436414d7ce12dd12..cbcef6d9d4113e318237df4501839d6870042c8d 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3385,6 +3385,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin