mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 20:22:05 -07:00
Fix some issues on the list
This commit is contained in:
@@ -775,21 +775,9 @@ index 4efcb8b595..60948afa4e 100644
|
||||
return this.b.size();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
|
||||
index b3799ab564..6827936435 100644
|
||||
index b3799ab564..5fae5a1233 100644
|
||||
--- a/src/main/java/net/minecraft/server/SystemUtils.java
|
||||
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
|
||||
@@ -0,0 +0,0 @@ public class SystemUtils {
|
||||
return Collectors.toMap(Entry::getKey, Entry::getValue);
|
||||
}
|
||||
|
||||
+<<<<<<< HEAD
|
||||
public static <T extends Comparable<T>> String a(IBlockState<T> iblockstate, T object) { // Paper - decompile fix
|
||||
+=======
|
||||
+ public static <T extends Comparable<T>> String a(IBlockState<T> iblockstate, T object) {
|
||||
+>>>>>>> e706ce5c69... MC Utils
|
||||
return iblockstate.a(object); // Paper - decompile fix
|
||||
}
|
||||
|
||||
@@ -0,0 +0,0 @@ public class SystemUtils {
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user