9
0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-21 07:49:18 +00:00

Update Upstream

This commit is contained in:
NONPLAYT
2022-11-15 00:34:04 +03:00
parent 79db6e6c76
commit 89cacb308a
17 changed files with 68 additions and 63 deletions

View File

@@ -7,10 +7,10 @@ Original code by CaffeineMC, licensed under GNU Lesser General Public License v3
You can find the original code on https://github.com/CaffeineMC/lithium-fabric (Yarn mappings)
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 2e65b44f10aeb44fd524a58e7eb815a566c1ad61..dfe1e522a747b894d43124b97eaceb0ab196ac44 100644
index 9aa3aca48d443f81201e93402ec413a26bd92cf4..1834470b549d8352317cf081173ff542c9faac1e 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -612,11 +612,18 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -614,11 +614,18 @@ public class Block extends BlockBehaviour implements ItemLike {
private final BlockState first;
private final BlockState second;
private final Direction direction;
@@ -29,7 +29,7 @@ index 2e65b44f10aeb44fd524a58e7eb815a566c1ad61..dfe1e522a747b894d43124b97eaceb0a
}
public boolean equals(Object object) {
@@ -632,11 +639,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -634,11 +641,7 @@ public class Block extends BlockBehaviour implements ItemLike {
}
public int hashCode() {