Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-14 18:40:10 +01:00
rebase
Dieser Commit ist enthalten in:
Ursprung
a9f38a8789
Commit
1f8e76b185
@ -964,18 +964,6 @@ index b82b218be1bd849fa280ea1fe0336e279bebfc18..77e35e18754bd2380e1d5f93c62e1d47
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static ChatFormatting getById(int colorIndex) {
|
public static ChatFormatting getById(int colorIndex) {
|
||||||
if (colorIndex < 0) {
|
if (colorIndex < 0) {
|
||||||
diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
||||||
index 4760fc27b1d4938a248c05af17fc93ab37084c00..750df4ab2fbfdcf759f4d3451340e66b6764391d 100644
|
|
||||||
--- a/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
||||||
+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
||||||
@@ -128,7 +128,6 @@ public class CompoundTag implements Tag {
|
|
||||||
/**
|
|
||||||
* You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
|
|
||||||
*/
|
|
||||||
- public UUID getUUID(String prefix) { return getUUID(prefix); } // Paper - OBFHELPER
|
|
||||||
public UUID getUUID(String key) {
|
|
||||||
return NbtUtils.loadUUID(this.get(key));
|
|
||||||
}
|
|
||||||
diff --git a/src/main/java/net/minecraft/nbt/StringTag.java b/src/main/java/net/minecraft/nbt/StringTag.java
|
diff --git a/src/main/java/net/minecraft/nbt/StringTag.java b/src/main/java/net/minecraft/nbt/StringTag.java
|
||||||
index ad1c1fbb15cbd744afe54e1c3b533e51021a89eb..b15cfb9374402d4b42d163bf8e3ec838f19004bc 100644
|
index ad1c1fbb15cbd744afe54e1c3b533e51021a89eb..b15cfb9374402d4b42d163bf8e3ec838f19004bc 100644
|
||||||
--- a/src/main/java/net/minecraft/nbt/StringTag.java
|
--- a/src/main/java/net/minecraft/nbt/StringTag.java
|
||||||
@ -1026,7 +1014,7 @@ index 3b8207046d38d3d14719ff6761a22e60a93628b7..c15860c77c7c24b1946c22f140f1b5c1
|
|||||||
|
|
||||||
public <T extends Enum<T>> T readEnum(Class<T> enumClass) {
|
public <T extends Enum<T>> T readEnum(Class<T> enumClass) {
|
||||||
diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
|
diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java
|
||||||
index 02d253243eb66c30d4f7f6b0e7361518516eefec..847c59dd1b4673f4a03d77717468e07e99fc80a4 100644
|
index 83e99af925c87433b59f9bed30dfbf4e490c1b84..b8a0c0411fd2caab21672de7f3e721645b61a8ba 100644
|
||||||
--- a/src/main/java/net/minecraft/network/PacketEncoder.java
|
--- a/src/main/java/net/minecraft/network/PacketEncoder.java
|
||||||
+++ b/src/main/java/net/minecraft/network/PacketEncoder.java
|
+++ b/src/main/java/net/minecraft/network/PacketEncoder.java
|
||||||
@@ -3,6 +3,7 @@ package net.minecraft.network;
|
@@ -3,6 +3,7 @@ package net.minecraft.network;
|
||||||
@ -1045,15 +1033,6 @@ index 02d253243eb66c30d4f7f6b0e7361518516eefec..847c59dd1b4673f4a03d77717468e07e
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
int i = friendlyByteBuf.writerIndex();
|
int i = friendlyByteBuf.writerIndex();
|
||||||
@@ -46,7 +48,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
|
|
||||||
}
|
|
||||||
} catch (Throwable var9) {
|
|
||||||
LOGGER.error(var9);
|
|
||||||
- throwable.printStackTrace(); // Paper - WHAT WAS IT? WHO DID THIS TO YOU? WHAT DID YOU SEE?
|
|
||||||
+ var9.printStackTrace(); // Paper - WHAT WAS IT? WHO DID THIS TO YOU? WHAT DID YOU SEE?
|
|
||||||
if (packet.isSkippable()) {
|
|
||||||
throw new SkipPacketException(var9);
|
|
||||||
} else {
|
|
||||||
diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
|
diff --git a/src/main/java/net/minecraft/network/chat/Component.java b/src/main/java/net/minecraft/network/chat/Component.java
|
||||||
index d9aac575213f3bda9c44ea2b3b6d1969ff82f09d..02d19fa4abdee0c8331734932a83e64694356030 100644
|
index d9aac575213f3bda9c44ea2b3b6d1969ff82f09d..02d19fa4abdee0c8331734932a83e64694356030 100644
|
||||||
--- a/src/main/java/net/minecraft/network/chat/Component.java
|
--- a/src/main/java/net/minecraft/network/chat/Component.java
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren