31699ae9a8
* Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: a6a9d2a4 Remove some old ApiStatus.Experimental annotations be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration 08f86d1c PR-971: Add Player methods for client-side potion effects 2e3024a9 PR-963: Add API for in-world structures a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality 1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent CraftBukkit Changes: 38fd4bd50 Fix accidentally renamed internal damage method 80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage 7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects 4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration 22a541a29 Improve support for per-world game rules cb7dccce2 PR-1348: Add Player methods for client-side potion effects b8d6109f0 PR-1335: Add API for in-world structures 4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity e74107678 Fix Crafter maximum stack size 0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality 4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason 20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette 3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook 333701839 SPIGOT-7572: Bee nests generated without bees f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
53 Zeilen
2.1 KiB
Diff
53 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: astei <andrew@steinborn.me>
|
|
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;
|