Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 10:59:17 +00:00
Code Issues Releases Activity

Fix #276 and #277

Browse Source
This commit is contained in:
violetc
2024-07-25 14:56:09 +08:00
parent 36813acd31
commit 7d09a3a0fb
101 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patches/server/0078-Cache-BlockStatePairKey-hash.patch Normal file
View File

@@ -0,0 +1,52 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:59:26 +0800
Subject: [PATCH] Cache BlockStatePairKey hash
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index 9740426bbe54e23d833cf93346de344ff089168b..ad79aab6b9c2cb6636f86225fb7f68858c3b8d53 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -627,11 +627,18 @@ public class Block extends BlockBehaviour implements ItemLike {
private final BlockState first;
private final BlockState second;
private final Direction direction;
+ private final int hash; // Leaves - cache BlockStatePairKey hash
public BlockStatePairKey(BlockState self, BlockState other, Direction facing) {
this.first = self;
this.second = other;
this.direction = facing;
+ // Leaves start - cache BlockStatePairKey hash
+ int hash = this.first.hashCode();
+ hash = 31 * hash + this.second.hashCode();
+ hash = 31 * hash + this.direction.hashCode();
+ this.hash = hash;
+ // Leaves end - cache BlockStatePairKey hash
}
public boolean equals(Object object) {
@@ -647,11 +654,17 @@ public class Block extends BlockBehaviour implements ItemLike {
}
public int hashCode() {
- int i = this.first.hashCode();
+ // Leaves start - cache BlockStatePairKey hash
+ if (!org.leavesmc.leaves.LeavesConfig.cacheBlockStatePairKeyHash) {
+ int i = this.first.hashCode();
- i = 31 * i + this.second.hashCode();
- i = 31 * i + this.direction.hashCode();
- return i;
+ i = 31 * i + this.second.hashCode();
+ i = 31 * i + this.direction.hashCode();
+ return i;
+ } else {
+ return this.hash;
+ }
+ // Leaves end - cache BlockStatePairKey hash
}
}
}