core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0362-Ignore-Dimension-NBT-f...

32 lines
1.4 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) 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 Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes: a46fdbc6 Remove outdated build delay. 3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material 9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission c3749a23 Remove the Damage tag from items when it is 0. f74c7b95 SPIGOT-4706: Can't interact with active item 494eef45 Mention requirement of JIRA ticket for bug fixes 51d62dec SPIGOT-4702: Exception when middle clicking certain slots be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
2019-04-22 21:36:14 +00:00
From 504acd5b82a2ade2f382e890d31ee27efb22aee4 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 04:11:50 +00: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) 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 Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes: a46fdbc6 Remove outdated build delay. 3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material 9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission c3749a23 Remove the Damage tag from items when it is 0. f74c7b95 SPIGOT-4706: Can't interact with active item 494eef45 Mention requirement of JIRA ticket for bug fixes 51d62dec SPIGOT-4702: Exception when middle clicking certain slots be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN
2019-04-22 21:36:14 +00:00
index d6d0dd6d88..3db1b6bb1b 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 04:11:50 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Default nether void damage to off and allow that
2019-04-05 05:27:37 +00:00
@@ -1732,7 +1732,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 04:11:50 +00: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 00:28:15 +00: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 04:11:50 +00:00