Skip to content

Commit 55fa953

Browse files
committed
Fix crash report sometimes going into an infinite loop
1 parent 0640669 commit 55fa953

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

patches/server/0001-Fix-Decompilation-errors.patch

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ index 48dcbc9c073e92ed640706d9322f67c3255821cd..13a165f9af83a33ed7f547f9a5e4b92e
218218

219219
if (this.b.containsKey(s1)) {
220220
diff --git a/src/main/java/net/minecraft/server/BlockStateList.java b/src/main/java/net/minecraft/server/BlockStateList.java
221-
index af665e7f924e57bfb1d3edeb7a9e3b3144f5bc3a..30585ea8f9f7b2c09f66df15880d7943f43044ae 100644
221+
index af665e7f924e57bfb1d3edeb7a9e3b3144f5bc3a..5539fbdcf02b0edb82d3d4c9488b6403e85887dd 100644
222222
--- a/src/main/java/net/minecraft/server/BlockStateList.java
223223
+++ b/src/main/java/net/minecraft/server/BlockStateList.java
224224
@@ -28,8 +28,8 @@ public class BlockStateList {
@@ -254,7 +254,7 @@ index af665e7f924e57bfb1d3edeb7a9e3b3144f5bc3a..30585ea8f9f7b2c09f66df15880d7943
254254
HashBasedTable hashbasedtable = HashBasedTable.create();
255255

256256
- for (IBlockState iblockstate : this.b.keySet()) {
257-
+ for (IBlockState<?> iblockstate : this.b.keySet()) {
257+
+ for (IBlockState<? extends Comparable> iblockstate : this.b.keySet()) {
258258
for (Comparable comparable : iblockstate.c()) {
259259
if (comparable != this.b.get(iblockstate)) {
260260
hashbasedtable.put(iblockstate, comparable, map.get(this.b(iblockstate, comparable)));
@@ -496,9 +496,18 @@ index 8553b83a17e40cd554816252b1221b7b9a9519e0..dd23fa6e7837b86eed10fc42a58ad5b8
496496

497497
for (ScoreboardObjective scoreboardobjective : collection) {
498498
diff --git a/src/main/java/net/minecraft/server/CrashReportSystemDetails.java b/src/main/java/net/minecraft/server/CrashReportSystemDetails.java
499-
index 72e906c0dff6aba8b4654a446b7df1e3c2438ad1..fadbe4835e4c6893c52dc23adf5b6b91bd26aad1 100644
499+
index 72e906c0dff6aba8b4654a446b7df1e3c2438ad1..47adde857204bc8bff28afc7a8e2c9b52c136083 100644
500500
--- a/src/main/java/net/minecraft/server/CrashReportSystemDetails.java
501501
+++ b/src/main/java/net/minecraft/server/CrashReportSystemDetails.java
502+
@@ -86,7 +86,7 @@ public class CrashReportSystemDetails {
503+
}
504+
505+
public void a(String s, Throwable throwable) {
506+
- this.a(s, throwable);
507+
+ this.a(s, (Object) throwable);
508+
}
509+
510+
public int a(int i) {
502511
@@ -167,7 +167,7 @@ public class CrashReportSystemDetails {
503512
}
504513
}

0 commit comments

Comments
 (0)