mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-25 09:59:15 +00:00
3c25377465
ClassInstanceMultiMap belongs to Minecraft vanilla entity storage. And is unused, since replaced by spottedleaf's entity storage (rewrite chunk system). However these patches might be useful for vanilla entity storage if is used.
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Thu, 12 Dec 2024 02:58:34 -0500
|
|
Subject: [PATCH] Cache ShapePairKey hash
|
|
|
|
License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
|
|
Gale - https://galemc.org
|
|
|
|
The JMH benchmark of this patch can be found in SunBox's `RecordHashCode`
|
|
|
|
diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java
|
|
index be6f37f91569c659c609e5e8d38671ca86f8cd95..cc5e4e82c2339d17edf76b9212774c9dfd8e514d 100644
|
|
--- a/net/minecraft/world/level/block/Block.java
|
|
+++ b/net/minecraft/world/level/block/Block.java
|
|
@@ -610,7 +610,20 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
}
|
|
// CraftBukkit end
|
|
|
|
- record ShapePairKey(VoxelShape first, VoxelShape second) {
|
|
+ // Gale start - cache ShapePairKey hash
|
|
+ static class ShapePairKey {
|
|
+
|
|
+ private final VoxelShape first;
|
|
+ private final VoxelShape second;
|
|
+ private final int hash;
|
|
+
|
|
+ private ShapePairKey(VoxelShape first, VoxelShape second) {
|
|
+ this.first = first;
|
|
+ this.second = second;
|
|
+ this.hash = System.identityHashCode(this.first) * 31 + System.identityHashCode(this.second);
|
|
+ }
|
|
+ // Gale end - cache ShapePairKey hash
|
|
+
|
|
@Override
|
|
public boolean equals(Object other) {
|
|
return other instanceof Block.ShapePairKey shapePairKey && this.first == shapePairKey.first && this.second == shapePairKey.second;
|
|
@@ -618,7 +631,7 @@ public class Block extends BlockBehaviour implements ItemLike {
|
|
|
|
@Override
|
|
public int hashCode() {
|
|
- return System.identityHashCode(this.first) * 31 + System.identityHashCode(this.second);
|
|
+ return this.hash; // Gale - cache ShapePairKey hash
|
|
}
|
|
}
|
|
}
|