aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
diff options
context:
space:
mode:
authorFireInstall <[email protected]>2024-03-23 20:27:30 +0100
committerGitHub <[email protected]>2024-03-23 20:27:30 +0100
commit9ec7dfcbc41c6e625de0050b6997160a75df9f44 (patch)
treeecfae4a17b8258b5ceb8fa4cb340e023b8031e8a /patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
parent88419b207579533646ab011da886030ea9ea4862 (diff)
downloadPaper-9ec7dfcbc41c6e625de0050b6997160a75df9f44.tar.gz
Paper-9ec7dfcbc41c6e625de0050b6997160a75df9f44.zip
Move invisible setting up to entities (#10346)
Diffstat (limited to 'patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch')
-rw-r--r--patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
index 436c536f74..b57a9d9bb2 100644
--- a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 822666e1199e0851136d88b2b556d8d17843d902..e6ef67a7a2eab5314c95e751895b4d4ce71c91b8 100644
+index 7dbbf0884b70acb37c3400364736fa8f6b68c964..5dce3d38ecd7b7639f02f3e1e92f3723f4a42c39 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2078,6 +2078,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -27,10 +27,10 @@ index 822666e1199e0851136d88b2b556d8d17843d902..e6ef67a7a2eab5314c95e751895b4d4c
return this.isPassenger() ? false : this.saveAsPassenger(nbt);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..411e2eed16d5b774900fc12f5ad782ab229dde97 100644
+index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb1073ed9f07 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1077,5 +1077,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1077,6 +1077,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return set;
}
@@ -45,7 +45,8 @@ index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..411e2eed16d5b774900fc12f5ad782ab
+ return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason);
+ }
// Paper end
- }
+
+ // Paper start - move up invisibility
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 609b103cb9af3b0554bf1116306874fe98c8534c..3f582c5653e13875cce4ef8ecd279d8a3d2b2dc2 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java