OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/Spigot-Server-Patches/0363-Ignore-Dimension-NBT-field-in-Entity-data.patch

32 lines
1.4 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
2019-03-20 02:46:00 +01:00
From 00a896b679177fdfc8eca7f47828cc42481641fe Mon Sep 17 00:00:00 2001
Ignore Dimension NBT field in Entity data Minecraft is trying to set Dimension Objects based on a Dimension ID Dimension ID's for custom worlds are dynamically allocate dand not guaranteed consistent. This removes checking the NBT data, as the Entity will always have its DimensionManager set to the world it is being placed into. This fixes corrupt entities breaking chunk saving in custom worlds.
2018-09-27 06:11:50 +02:00
From: Aikar <aikar@aikar.co>
Date: Thu, 27 Sep 2018 00:08:31 -0400
Subject: [PATCH] Ignore Dimension NBT field in Entity data
Minecraft is trying to set Dimension Objects based on a Dimension ID
Dimension ID's for custom worlds are dynamically allocate dand not guaranteed
consistent.
This removes checking the NBT data, as the Entity will always have its
DimensionManager set to the world it is being placed into.
This fixes corrupt entities breaking chunk saving in custom worlds.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
2019-03-20 02:46:00 +01:00
index 3e81ebdb8..52ef2c9c2 100644
Ignore Dimension NBT field in Entity data Minecraft is trying to set Dimension Objects based on a Dimension ID Dimension ID's for custom worlds are dynamically allocate dand not guaranteed consistent. This removes checking the NBT data, as the Entity will always have its DimensionManager set to the world it is being placed into. This fixes corrupt entities breaking chunk saving in custom worlds.
2018-09-27 06:11:50 +02:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Stop loading entity bounding boxes from NBT This may be creating more issues than it's solving cc GH-1806
2019-03-16 04:25:32 +01:00
@@ -1729,7 +1729,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Ignore Dimension NBT field in Entity data Minecraft is trying to set Dimension Objects based on a Dimension ID Dimension ID's for custom worlds are dynamically allocate dand not guaranteed consistent. This removes checking the NBT data, as the Entity will always have its DimensionManager set to the world it is being placed into. This fixes corrupt entities breaking chunk saving in custom worlds.
2018-09-27 06:11:50 +02:00
this.setAirTicks(nbttagcompound.getShort("Air"));
this.onGround = nbttagcompound.getBoolean("OnGround");
if (nbttagcompound.hasKey("Dimension")) {
- this.dimension = DimensionManager.a(nbttagcompound.getInt("Dimension"));
+ //this.dimension = DimensionManager.a(nbttagcompound.getInt("Dimension")); // Paper - always controlled by world
}
this.invulnerable = nbttagcompound.getBoolean("Invulnerable");
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes: 8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep 8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals 39a287b7 Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
2019-03-20 01:28:15 +01:00
2.21.0
Ignore Dimension NBT field in Entity data Minecraft is trying to set Dimension Objects based on a Dimension ID Dimension ID's for custom worlds are dynamically allocate dand not guaranteed consistent. This removes checking the NBT data, as the Entity will always have its DimensionManager set to the world it is being placed into. This fixes corrupt entities breaking chunk saving in custom worlds.
2018-09-27 06:11:50 +02:00
Reference in a new issue Copy permalink