Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implement Velocity VarInt optimizations (#8418) 

---------

Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
This commit is contained in:
Gero 2023-10-29 01:56:47 +02:00 committed by GitHub
parent 5bdfb29ba1
commit a81a384303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/1039-Add-player-idle-duration-API.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API
Implements API for getting and resetting a player's idle duration.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 604ed1f6742a6b028b9db2809f7bd4b9a3b38f4d..bd2cb9080a5a215c97d4dc038ab8e8d1f7c20f8f 100644
index 57229748ae446d70dbc3d71219d9f81f5c8f72b1..743b3c952e01de44905cacac3ffd501e2059238f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3278,6 +3278,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3280,6 +3280,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper end

0
patches/server/1039-Fix-NPE-in-SculkBloomEvent-world-access.patch → patches/server/1040-Fix-NPE-in-SculkBloomEvent-world-access.patch
View File

2
patches/server/1040-Allow-null-itemstack-for-Player-sendEquipmentChange.patch → patches/server/1041-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 57229748ae446d70dbc3d71219d9f81f5c8f72b1..cce782907821b4f84fa865574a7483291369eac7 100644
index 743b3c952e01de44905cacac3ffd501e2059238f..4f237880cf53ec2eb4e7c93dccc168bbb682f473 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1072,7 +1072,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

52
patches/server/1042-Optimize-VarInts.patch Normal file
View File

@ -0,0 +1,52 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Sat, 28 Oct 2023 19:46:21 -0400
Subject: [PATCH] Optimize VarInts
https://github.com/PaperMC/Paper/pull/6957#issuecomment-985250854
diff --git a/src/main/java/net/minecraft/network/VarInt.java b/src/main/java/net/minecraft/network/VarInt.java
index 18d5a22ad3ef4cb279475531dbc2c65e07c69929..3f362eb42587b333e27b9cf25588a9cfcb8a56e7 100644
--- a/src/main/java/net/minecraft/network/VarInt.java
+++ b/src/main/java/net/minecraft/network/VarInt.java
@@ -9,6 +9,18 @@ public class VarInt {
private static final int DATA_BITS_PER_BYTE = 7;
public static int getByteSize(int i) {
+ // Paper start - Optimize VarInts
+ return VARINT_EXACT_BYTE_LENGTHS[Integer.numberOfLeadingZeros(i)];
+ }
+ private static final int[] VARINT_EXACT_BYTE_LENGTHS = new int[33];
+ static {
+ for (int i = 0; i <= 32; ++i) {
+ VARINT_EXACT_BYTE_LENGTHS[i] = (int) Math.ceil((31d - (i - 1)) / 7d);
+ }
+ VARINT_EXACT_BYTE_LENGTHS[32] = 1; // Special case for the number 0.
+ }
+ public static int getByteSizeOld(int i) {
+ //Paper end - Optimize VarInts
for(int j = 1; j < 5; ++j) {
if ((i & -1 << j * 7) == 0) {
return j;
@@ -39,6 +51,21 @@ public class VarInt {
}
public static ByteBuf write(ByteBuf buf, int i) {
+ // Paper start - Optimize VarInts
+ // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
+ // that the proxy will write, to improve inlining.
+ if ((i & (0xFFFFFFFF << 7)) == 0) {
+ buf.writeByte(i);
+ } else if ((i & (0xFFFFFFFF << 14)) == 0) {
+ int w = (i & 0x7F | 0x80) << 8 | (i >>> 7);
+ buf.writeShort(w);
+ } else {
+ writeOld(buf, i);
+ }
+ return buf;
+ }
+ public static ByteBuf writeOld(ByteBuf buf, int i) {
+ // Paper end - Optimize VarInts
while((i & -128) != 0) {
buf.writeByte(i & 127 | 128);
i >>>= 7;