mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-31 16:00:18 +01:00
Rebase
This commit is contained in:
parent
26254e31ea
commit
ae4eca6fd1
@ -5,10 +5,10 @@ Subject: [PATCH] Add raw byte block state serialization
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
||||||
index e3b07d623cd64de9645f2372f1e08757edc1a9ed..0046a230aa1331736f7e282c872528d19796fc17 100644
|
index 9271ff2a9ea05569e3c81886399aa7ab47efb05d..78234964c1e2107ff73d4f31b060ca6a5c38ea27 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java
|
||||||
@@ -231,13 +231,18 @@ public final class CraftBlockStates {
|
@@ -235,13 +235,18 @@ public final class CraftBlockStates {
|
||||||
return CraftBlockStates.getBlockState(block, true);
|
return CraftBlockStates.getBlockState(block, true);
|
||||||
}
|
}
|
||||||
public static BlockState getBlockState(Block block, boolean useSnapshot) {
|
public static BlockState getBlockState(Block block, boolean useSnapshot) {
|
||||||
@ -30,10 +30,10 @@ index e3b07d623cd64de9645f2372f1e08757edc1a9ed..0046a230aa1331736f7e282c872528d1
|
|||||||
boolean prev = CraftBlockEntityState.DISABLE_SNAPSHOT;
|
boolean prev = CraftBlockEntityState.DISABLE_SNAPSHOT;
|
||||||
CraftBlockEntityState.DISABLE_SNAPSHOT = !useSnapshot;
|
CraftBlockEntityState.DISABLE_SNAPSHOT = !useSnapshot;
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
index 6b31f88803041c75023a2c99bdc1efd902f0205c..9bbaf03775d60361fda21161a88f7712f27e626e 100644
|
index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..866d1f5cee46594475717b247902b8832bcb315b 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||||
@@ -519,6 +519,42 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
@@ -526,6 +526,42 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||||||
.orElseThrow(() -> new IllegalArgumentException("An ID was not found for the data. Did you downgrade?")).getBukkitEntity();
|
.orElseThrow(() -> new IllegalArgumentException("An ID was not found for the data. Did you downgrade?")).getBukkitEntity();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user