mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 18:45:54 +01:00
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
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Techcable <Techcable@outlook.com>
|
|
Date: Wed, 30 Nov 2016 20:56:58 -0600
|
|
Subject: [PATCH] Improve BlockPosition inlining
|
|
|
|
Normally the JVM can inline virtual getters by having two sets of code, one is the 'optimized' code and the other is the 'deoptimized' code.
|
|
If a single type is used 99% of the time, then its worth it to inline, and to revert to 'deoptimized' the 1% of the time we encounter other types.
|
|
But if two types are encountered commonly, then the JVM can't inline them both, and the call overhead remains.
|
|
|
|
This scenario also occurs with BlockPos and MutableBlockPos.
|
|
The variables in BlockPos are final, so MutableBlockPos can't modify them.
|
|
MutableBlockPos fixes this by adding custom mutable variables, and overriding the getters to access them.
|
|
|
|
This approach with utility methods that operate on MutableBlockPos and BlockPos.
|
|
Specific examples are BlockPosition.up(), and World.isValidLocation().
|
|
It makes these simple methods much slower than they need to be.
|
|
|
|
This should result in an across the board speedup in anything that accesses blocks or does logic with positions.
|
|
|
|
This is based upon conclusions drawn from inspecting the assenmbly generated bythe JIT compiler on my microbenchmarks.
|
|
They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
|
|
|
|
diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java
|
|
index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..5256ff18d992250e04a6180e196c2d5d3f0928ca 100644
|
|
--- a/src/main/java/net/minecraft/core/Vec3i.java
|
|
+++ b/src/main/java/net/minecraft/core/Vec3i.java
|
|
@@ -38,7 +38,7 @@ public class Vec3i implements Comparable<Vec3i> {
|
|
}
|
|
|
|
@Override
|
|
- public boolean equals(Object object) {
|
|
+ public final boolean equals(Object object) { // Paper - Perf: Final for inline
|
|
if (this == object) {
|
|
return true;
|
|
} else if (!(object instanceof Vec3i)) {
|
|
@@ -56,7 +56,7 @@ public class Vec3i implements Comparable<Vec3i> {
|
|
}
|
|
|
|
@Override
|
|
- public int hashCode() {
|
|
+ public final int hashCode() { // Paper - Perf: Final for inline
|
|
return (this.getY() + this.getZ() * 31) * 31 + this.getX();
|
|
}
|
|
|
|
@@ -69,15 +69,15 @@ public class Vec3i implements Comparable<Vec3i> {
|
|
}
|
|
}
|
|
|
|
- public int getX() {
|
|
+ public final int getX() { // Paper - Perf: Final for inline
|
|
return this.x;
|
|
}
|
|
|
|
- public int getY() {
|
|
+ public final int getY() { // Paper - Perf: Final for inline
|
|
return this.y;
|
|
}
|
|
|
|
- public int getZ() {
|
|
+ public final int getZ() { // Paper - Perf: Final for inline
|
|
return this.z;
|
|
}
|
|
|