Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in method names #237

Merged
merged 3 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Also avoids spamming closed channel exception by rechecking closed state in disp
and then catch exceptions and close if they fire.

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 9ece4582635db8d9547302421b44f67e262fd0f7..c5d4b55450eab00ff8a7c3d269d6547c3b9b3946 100644
index 9ece4582635db8d9547302421b44f67e262fd0f7..7d5a3c4b6d9958efde5f918963631603efd33877 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
Expand Down Expand Up @@ -284,7 +284,7 @@ index 9ece4582635db8d9547302421b44f67e262fd0f7..c5d4b55450eab00ff8a7c3d269d6547c
+ return false;
+ } else {
+ iterator.remove();
+ this.dispatchPacket(packet, queued.getGenericFutureListeners());
+ this.dispatchPacket(packet, queued.getGenericFutureListener());
+ }
}
+ return true;
Expand Down Expand Up @@ -342,7 +342,7 @@ index 9ece4582635db8d9547302421b44f67e262fd0f7..c5d4b55450eab00ff8a7c3d269d6547c
- private final Packet a;
- private final GenericFutureListener<? extends Future<? super Void>>[] b;
+ private final Packet a; private final Packet getPacket() { return this.a; } // PandaSpigot - OBFHELPER
+ private final GenericFutureListener<? extends Future<? super Void>>[] b; private final GenericFutureListener<? extends Future<? super Void>>[] getGenericFutureListeners() { return this.b; } // PandaSpigot - OBFHELPER
+ private final GenericFutureListener<? extends Future<? super Void>>[] b; private final GenericFutureListener<? extends Future<? super Void>>[] getGenericFutureListener() { return this.b; } // PandaSpigot - OBFHELPER

public QueuedPacket(Packet packet, GenericFutureListener<? extends Future<? super Void>>... agenericfuturelistener) {
this.a = packet;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Only make one flush call when emptying the packet queue too.
This patch will be used to optimise out flush calls in later patches.

diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index c5d4b55450eab00ff8a7c3d269d6547c3b9b3946..d28db401156be4758533ab2008930e925261af11 100644
index 7d5a3c4b6d9958efde5f918963631603efd33877..b455a3159cd79704ba8da66ca540a4ea48719f05 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -81,6 +81,38 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
Expand Down Expand Up @@ -121,9 +121,9 @@ index c5d4b55450eab00ff8a7c3d269d6547c3b9b3946..d28db401156be4758533ab2008930e92
return false;
} else {
iterator.remove();
- this.dispatchPacket(packet, queued.getGenericFutureListeners());
- this.dispatchPacket(packet, queued.getGenericFutureListener());
+ // PandaSpigot start - make only one flush call per sendPacketQueue() call
+ this.writePacket(packet, queued.getGenericFutureListeners(), (!iterator.hasNext() && (needsFlush || this.canFlush)) ? Boolean.TRUE : Boolean.FALSE);
+ this.writePacket(packet, queued.getGenericFutureListener(), (!iterator.hasNext() && (needsFlush || this.canFlush)) ? Boolean.TRUE : Boolean.FALSE);
+ hasWrotePacket = true;
+ // PandaSpigot end
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ index 05c9ebb76a3cb19e887bea1311ac36035334b9a1..1e0393f667029809ac3476069cebe1ef
+ public boolean optimizeLiquidExplosions = true; // This seems like a pretty sane default
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 854cf888d64e50bfd85420bb5dcc93860a64f132..c4be7d4e156d8d685ffb2b9fc5f0045ee471ef96 100644
index 854cf888d64e50bfd85420bb5dcc93860a64f132..b0aee5e189d70e2f68c3c95a6406467981c25e2b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -529,7 +529,16 @@ public abstract class Entity implements ICommandListener {
Expand All @@ -31,10 +31,10 @@ index 854cf888d64e50bfd85420bb5dcc93860a64f132..c4be7d4e156d8d685ffb2b9fc5f0045e
- List list = this.world.getCubes(this, this.getBoundingBox().a(d0, d1, d2));
+ // PandaSpigot start - do axis by axis scan if the entity is travelling a large area
+ AxisAlignedBB totalArea = this.getBoundingBox().a(d0, d1, d2);
+ double xLenght = totalArea.d - totalArea.a;
+ double yLenght = totalArea.e - totalArea.b;
+ double zLenght = totalArea.f - totalArea.c;
+ boolean axisScan = this.world.pandaSpigotConfig.optimizeTntMovement && xLenght * yLenght * zLenght > 10;
+ double xLength = totalArea.d - totalArea.a;
+ double yLength = totalArea.e - totalArea.b;
+ double zLength = totalArea.f - totalArea.c;
+ boolean axisScan = this.world.pandaSpigotConfig.optimizeTntMovement && xLength * yLength * zLength > 10;
+
+ List list = this.world.getCubes(this, axisScan ? this.getBoundingBox().a(0, d1, 0) : totalArea);
+ // PandaSpigot end
Expand Down
Loading