Skip to content

Commit 7fafdbf

Browse files
SamsuikSamsuik
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@dc3ef2a Fix vanilla components not being translated (#9893) PaperMC/Paper@7e15d97 Remove no longer needed diff from adventure patch PaperMC/Paper@f1820dc Fix incorrect border collision detection PaperMC/Paper@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034) PaperMC/Paper@ff26d54 send sound and particle packets immediately even if off main (#10033) PaperMC/Paper@e3140fb hotfix spawning item/xp in wrong spot PaperMC/Paper@0b95298 Make worldborder collisions consistent with Vanilla PaperMC/Paper@47b2c18 Don't fire the drop event on player deaths (#10046) PaperMC/Paper@8c007d9 properly read and store sus effect duration (#10050) PaperMC/Paper@5385b21 [ci skip] Make test results viewable in-browser and downloadable (#10055) PaperMC/Paper@086ca61 Fix world border edge collision (#10053) PaperMC/Paper@45e01a2 Use correct max stack size in crafter (#10057) PaperMC/Paper@d11a588 Remove duplicate code in chunk tick iteration (#10056) PaperMC/Paper@b4c9e7e add missing Experimental annotations (#10012)
1 parent 78a9fcd commit 7fafdbf

24 files changed

+88
-145
lines changed

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
22
version=1.20.4-R0.1-SNAPSHOT
33

44
mcVersion=1.20.4
5-
paperRef=0fadaed0783782877502a24fac53a63753959191
5+
paperRef=b4c9e7e5d40fd4a0a7fea270fd4ebb72b38fa0fc
66

77
org.gradle.jvmargs=-Xmx2G
88

‎patches/server/0001-Branding-changes.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] Branding changes
66
From ForkPaper.
77

88
diff --git a/build.gradle.kts b/build.gradle.kts
9-
index 170a915098f09ace226648da342a04c5c7583d11..b71b33dabf3066e4b098c6de7bdb21222da2e304 100644
9+
index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..2d57d5611cc5784e07c2e28b30891b75b05dca43 100644
1010
--- a/build.gradle.kts
1111
+++ b/build.gradle.kts
1212
@@ -27,8 +27,12 @@ repositories {
@@ -47,10 +47,10 @@ index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..6e1c140d0d26728d64b827f6f3e5a450
4747

4848
public SystemReport fillSystemReport(SystemReport details) {
4949
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
50-
index 782bb8ca67517dde5dba8f0a133eb8699353dd01..05afb663ecc4d34b80bd6c66d01cd2677bd75f38 100644
50+
index e011cfcdda2e0a609d4158b0454bdf046b04c9d9..75198c29643f88ad6f6e94b142eac05f124c5a10 100644
5151
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
5252
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
53-
@@ -270,7 +270,7 @@ import javax.annotation.Nullable; // Paper
53+
@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
5454
import javax.annotation.Nonnull; // Paper
5555

5656
public final class CraftServer implements Server {

‎patches/server/0004-Sakura-Configuration-Files.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ index 58536aabf607015939a1326f80207c0a06eed8ff..102c5bb9a1702b06ed6418bfe9e41319
976976
this.setPvpAllowed(dedicatedserverproperties.pvp);
977977
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
978978
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
979-
index f4d53d9bfe5b060158f69b5d9e4533a5b9869eed..03fcd3d24b18745c3ddbc20edbb06b92417db341 100644
979+
index b78a9628a88f2a495ef6de74446a02a14d41a1f6..1f36015d2e9c433cfe2de079b8eba144f0dad4cf 100644
980980
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
981981
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
982982
@@ -693,7 +693,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1018,18 +1018,18 @@ index 0b56e5f7f18fc4286992af22d402205b771165a3..be86deb703272d014de14a9789a5c505
10181018
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
10191019

10201020
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1021-
index 05afb663ecc4d34b80bd6c66d01cd2677bd75f38..872a30aa8695eaf8784792c84483c417c89dc867 100644
1021+
index 75198c29643f88ad6f6e94b142eac05f124c5a10..1cd650d96686c34d2d439e3edef3c214306b975b 100644
10221022
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
10231023
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1024-
@@ -1036,6 +1036,7 @@ public final class CraftServer implements Server {
1024+
@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
10251025

10261026
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
10271027
this.console.paperConfigurations.reloadConfigs(this.console);
10281028
+ this.console.sakuraConfigurations.reloadConfigs(this.console); // Sakura - missing comment above
10291029
for (ServerLevel world : this.console.getAllLevels()) {
10301030
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
10311031
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
1032-
@@ -1066,6 +1067,7 @@ public final class CraftServer implements Server {
1032+
@@ -1067,6 +1068,7 @@ public final class CraftServer implements Server {
10331033
this.reloadData();
10341034
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
10351035
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -1038,7 +1038,7 @@ index 05afb663ecc4d34b80bd6c66d01cd2677bd75f38..872a30aa8695eaf8784792c84483c417
10381038
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
10391039

10401040
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
1041-
index 4b457cbfc56e55e0ae0fee5b69e2e75349702aab..7f88e9fb060d0f2c6ad94277072805c9bc69fadf 100644
1041+
index a74a8a027c99eef199c1a6a54232ac2c8ffb9d08..0bf24ee26eb96f02918fd82b5967681e3df2ce85 100644
10421042
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
10431043
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
10441044
@@ -174,6 +174,14 @@ public class Main {

‎patches/server/0006-Visibility-API-and-Command.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ index 1f36015d2e9c433cfe2de079b8eba144f0dad4cf..c33c9cb3a0e574e5284e48ffaf8d0945
404404
}
405405
}
406406
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
407-
index 8efbbd379244e3ed54d4aba199037cc20ccd096a..3ef738c817c10a9233b930296ce5df6e6dc0a58b 100644
407+
index d1f20a8a3ccea1f074624163eb96da023142a459..29422f36aa5727ae9e8f6728964fda9889986e02 100644
408408
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
409409
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
410410
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -561,10 +561,10 @@ index 30ccbab1586a656e0ae41d7406525fb02d9e025b..187ba90c50256aaa0514f4b2bd79bf30
561561
if (this.player.containerMenu != oldContainer) {
562562
return;
563563
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
564-
index 9abe817ae202edaa2d88cd59ae5c7db0b1c634be..f3b02609297b663559b82984dcd93db186e645f5 100644
564+
index 0c46a4aeafd03fbbfd590b0362d41bf2b1d5ca74..b2d2b6d588572682730a228888b6dcdae2dc5020 100644
565565
--- a/src/main/java/net/minecraft/world/entity/Entity.java
566566
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
567-
@@ -536,6 +536,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
567+
@@ -535,6 +535,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
568568
this.teleportTo(worldserver, null);
569569
}
570570
// Paper end - make end portalling safe
@@ -611,10 +611,10 @@ index 512088b5457e5afbc29d2937051fc4dcc4c5aed6..8fd4d63fdbff9c454d903f4797ec9281
611611
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
612612
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
613613
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
614-
index fd84786f3e72875e79df46416f47f3403876cef3..044033eb34581849ecb0463164ca05bf19466c76 100644
614+
index 3be5e4df190bff0087c8450b16e4e37b07169040..201a5c5652232cfc64c476d066225df6bb1690d3 100644
615615
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
616616
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
617-
@@ -497,6 +497,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
617+
@@ -494,6 +494,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
618618
this.getHandle().displayName = name == null ? this.getName() : name;
619619
}
620620

‎patches/server/0008-Reduce-deltaMovement-Allocations.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce deltaMovement Allocations
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
8-
index f3b02609297b663559b82984dcd93db186e645f5..8e877437f4d27ef210c9bfbbdbe16e2c328b4e54 100644
8+
index b2d2b6d588572682730a228888b6dcdae2dc5020..4ffa96f7eeefd6a2a07458f68458cdbf4369340f 100644
99
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
11-
@@ -1234,7 +1234,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
11+
@@ -1233,7 +1233,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
1212
this.tryCheckInsideBlocks();
1313
float f = this.getBlockSpeedFactor();
1414

@@ -17,15 +17,15 @@ index f3b02609297b663559b82984dcd93db186e645f5..8e877437f4d27ef210c9bfbbdbe16e2c
1717
// Paper start - remove expensive streams from here
1818
boolean noneMatch = true;
1919
AABB fireSearchBox = this.getBoundingBox().deflate(1.0E-6D);
20-
@@ -2054,6 +2054,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
20+
@@ -2049,6 +2049,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
2121
public void moveTo(double x, double y, double z, float yaw, float pitch) {
2222
// Paper - cancel entity velocity if teleported
2323
if (!preserveMotion) {
2424
+ this.movementDirty = false; // Sakura
2525
this.deltaMovement = Vec3.ZERO;
2626
} else {
2727
this.preserveMotion = false;
28-
@@ -3456,29 +3457,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
28+
@@ -3451,29 +3452,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
2929
}
3030

3131
public void onAboveBubbleCol(boolean drag) {
@@ -67,7 +67,7 @@ index f3b02609297b663559b82984dcd93db186e645f5..8e877437f4d27ef210c9bfbbdbe16e2c
6767
this.resetFallDistance();
6868
}
6969

70-
@@ -4465,16 +4470,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
70+
@@ -4460,16 +4465,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
7171
vec3d = vec3d.normalize();
7272
}
7373

@@ -90,7 +90,7 @@ index f3b02609297b663559b82984dcd93db186e645f5..8e877437f4d27ef210c9bfbbdbe16e2c
9090
}
9191

9292
this.fluidHeight.put(tag, d1);
93-
@@ -4545,11 +4553,53 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
93+
@@ -4540,11 +4548,53 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
9494
return this.chunkPosition;
9595
}
9696

@@ -144,7 +144,7 @@ index f3b02609297b663559b82984dcd93db186e645f5..8e877437f4d27ef210c9bfbbdbe16e2c
144144
synchronized (this.posLock) { // Paper
145145
this.deltaMovement = velocity;
146146
} // Paper
147-
@@ -4560,7 +4610,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
147+
@@ -4555,7 +4605,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
148148
}
149149

150150
public void setDeltaMovement(double x, double y, double z) {
@@ -214,7 +214,7 @@ index 62a3cd512d473d5ed673386d5c15091a09426945..12067c0372ad2803ffa2501a8296496a
214214

215215
int i = this.getFuse() - 1;
216216
diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
217-
index 87897b21c422a6301a08b388a69b3cec650bdfb5..9fdfc43ea51a326444a04d79976d315aa64050d1 100644
217+
index 9cd244090c294927a7a92c920854d2282ea3f021..3d4a75302d72bdbe47d0efbe08c89401dbe22a87 100644
218218
--- a/src/main/java/net/minecraft/world/level/Explosion.java
219219
+++ b/src/main/java/net/minecraft/world/level/Explosion.java
220220
@@ -619,10 +619,11 @@ public class Explosion {

‎patches/server/0010-Load-Chunks-on-Movement.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ Subject: [PATCH] Load Chunks on Movement
55

66

77
diff --git a/src/main/java/io/papermc/paper/util/CollisionUtil.java b/src/main/java/io/papermc/paper/util/CollisionUtil.java
8-
index bfb1de19f53d5d7c7b65e25a606fabfa416706b3..ae2eede559bd9fe7e500ce180f2ac102a95d3856 100644
8+
index ee0331a6bc40cdde08d926fd8eb1dc642630c2e5..57ca8212991d0660dd41b70350f59830d4fd09f3 100644
99
--- a/src/main/java/io/papermc/paper/util/CollisionUtil.java
1010
+++ b/src/main/java/io/papermc/paper/util/CollisionUtil.java
11-
@@ -1595,6 +1595,7 @@ public final class CollisionUtil {
11+
@@ -1569,6 +1569,7 @@ public final class CollisionUtil {
1212
public static final int COLLISION_FLAG_COLLIDE_WITH_UNLOADED_CHUNKS = 1 << 1;
1313
public static final int COLLISION_FLAG_CHECK_BORDER = 1 << 2;
1414
public static final int COLLISION_FLAG_CHECK_ONLY = 1 << 3;
1515
+ public static final int COLLISION_FLAG_ADD_TICKET = 1 << 4; // Sakura
1616

1717
public static boolean getCollisionsForBlocksOrWorldBorder(final Level world, final Entity entity, final AABB aabb,
1818
final List<VoxelShape> intoVoxel, final List<AABB> intoAABB,
19-
@@ -1644,11 +1645,20 @@ public final class CollisionUtil {
19+
@@ -1619,11 +1620,20 @@ public final class CollisionUtil {
2020
final int maxChunkZ = maxBlockZ >> 4;
2121

2222
final boolean loadChunks = (collisionFlags & COLLISION_FLAG_LOAD_CHUNKS) != 0;
@@ -50,17 +50,17 @@ index 658e63ebde81dc14c8ab5850fb246dc0aab25dea..f1ff1a67fee37ee7b241ceaa164fa4ee
5050
public static <T> TicketType<T> create(String name, Comparator<T> argumentComparator) {
5151
return new TicketType<>(name, argumentComparator, 0L);
5252
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
53-
index 8e877437f4d27ef210c9bfbbdbe16e2c328b4e54..2336ca9f16d8d570eeeff8cd780fa02c0138be04 100644
53+
index 4ffa96f7eeefd6a2a07458f68458cdbf4369340f..583f94cd4f517f17909da43f546e8c9e4580d3ad 100644
5454
--- a/src/main/java/net/minecraft/world/entity/Entity.java
5555
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
56-
@@ -538,6 +538,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
56+
@@ -537,6 +537,19 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
5757
// Paper end - make end portalling safe
5858
public boolean isPrimedTNT; // Sakura
5959
public boolean isFallingBlock; // Sakura
6060
+ // Sakura start
6161
+ protected boolean loadChunks = false;
6262
+
63-
+ private int getCollisionFlags() {
63+
+ private int getExtraCollisionFlags() {
6464
+ int flags = 0;
6565
+
6666
+ if (this.loadChunks) {
@@ -73,16 +73,16 @@ index 8e877437f4d27ef210c9bfbbdbe16e2c328b4e54..2336ca9f16d8d570eeeff8cd780fa02c
7373

7474
public boolean isLegacyTrackingEntity = false;
7575

76-
@@ -1495,7 +1508,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
76+
@@ -1494,7 +1507,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
7777

7878
io.papermc.paper.util.CollisionUtil.getCollisions(
7979
world, this, collisionBox, potentialCollisionsVoxel, potentialCollisionsBB,
80-
- (0),
81-
+ this.getCollisionFlags(), // Sakura
80+
- io.papermc.paper.util.CollisionUtil.COLLISION_FLAG_CHECK_BORDER,
81+
+ io.papermc.paper.util.CollisionUtil.COLLISION_FLAG_CHECK_BORDER | this.getExtraCollisionFlags(), // Sakura
8282
null, null
8383
);
8484

85-
@@ -4880,7 +4893,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
85+
@@ -4875,7 +4888,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
8686

8787
@Override
8888
public boolean isAlwaysTicking() {

‎patches/server/0013-Slice-Packet-obfuscation-and-reduction.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ index 83c4639c2bdca4dc4281d9f5eca104af3063bfa5..f7d8aaededd39ce52a9d0105f66fd759
203203

204204
if (this.entity instanceof LivingEntity) {
205205
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
206-
index 2336ca9f16d8d570eeeff8cd780fa02c0138be04..d81156d33184ea5a58e3c4e71eaef9f4c5990ea0 100644
206+
index 583f94cd4f517f17909da43f546e8c9e4580d3ad..d69dfd44a9ff3ee6861042fa8f5a64c2031815cd 100644
207207
--- a/src/main/java/net/minecraft/world/entity/Entity.java
208208
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
209-
@@ -3400,7 +3400,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
209+
@@ -3395,7 +3395,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
210210
this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
211211
return;
212212
}

‎patches/server/0018-Store-Entity-Data-State.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ index 0000000000000000000000000000000000000000..c9f2c5ae57878283e8c8bc3847fe63b9
5252
+
5353
+}
5454
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
55-
index d81156d33184ea5a58e3c4e71eaef9f4c5990ea0..89af45a998dd1884bac8ace525b87be9dd291789 100644
55+
index d69dfd44a9ff3ee6861042fa8f5a64c2031815cd..70ca40c87c161d96a3661066386f2560d0aeca6d 100644
5656
--- a/src/main/java/net/minecraft/world/entity/Entity.java
5757
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
58-
@@ -551,6 +551,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
58+
@@ -550,6 +550,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
5959
return flags;
6060
}
6161
// Sakura end

‎patches/server/0019-Merge-Cannon-Entities.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ index f48eaebb0f9a10fb77e85619b2d2a4996e461195..a507605a04af7f576548129517029192
189189
this.guardEntityTick(this::tickNonPassenger, entity);
190190
gameprofilerfiller.pop();
191191
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
192-
index 89af45a998dd1884bac8ace525b87be9dd291789..6e2defee2a8523d7025a8341b41488192618dd1a 100644
192+
index 70ca40c87c161d96a3661066386f2560d0aeca6d..ce0f8567f8b3d52b806c2c0ef600852ee192c05b 100644
193193
--- a/src/main/java/net/minecraft/world/entity/Entity.java
194194
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
195-
@@ -579,6 +579,107 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
195+
@@ -578,6 +578,107 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
196196
return BlockPos.asLong(v.getBlockX(), v.getBlockY(), v.getBlockZ());
197197
}
198198
// Sakura end
@@ -300,15 +300,15 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..6e2defee2a8523d7025a8341b4148819
300300

301301
public boolean isLegacyTrackingEntity = false;
302302

303-
@@ -657,6 +758,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
303+
@@ -656,6 +757,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
304304
this.getEntityData().registrationLocked = true; // Spigot
305305
this.setPos(0.0D, 0.0D, 0.0D);
306306
this.eyeHeight = this.getEyeHeight(net.minecraft.world.entity.Pose.STANDING, this.dimensions);
307307
+ this.mergeLevel = level.sakuraConfig().cannons.mergeLevel; // Sakura
308308
}
309309

310310
public boolean isColliding(BlockPos pos, BlockState state) {
311-
@@ -2522,6 +2624,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
311+
@@ -2517,6 +2619,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
312312
nbttagcompound.putBoolean("Paper.FreezeLock", true);
313313
}
314314
// Paper end
@@ -320,7 +320,7 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..6e2defee2a8523d7025a8341b4148819
320320
return nbttagcompound;
321321
} catch (Throwable throwable) {
322322
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
323-
@@ -2669,6 +2776,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
323+
@@ -2664,6 +2771,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
324324
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
325325
}
326326
// Paper end
@@ -332,7 +332,7 @@ index 89af45a998dd1884bac8ace525b87be9dd291789..6e2defee2a8523d7025a8341b4148819
332332

333333
} catch (Throwable throwable) {
334334
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
335-
@@ -4876,6 +4988,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
335+
@@ -4871,6 +4983,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
336336
return;
337337
}
338338
// Paper end - rewrite chunk system

0 commit comments

Comments
 (0)