Organize removed patches (#5836)
This commit is contained in:
parent
24b7da65ee
commit
38e4dc3050
|
@ -6,6 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
|
||||||
Massive hit to performance and it is completely unnecessary.
|
Massive hit to performance and it is completely unnecessary.
|
||||||
|
|
||||||
Removed during 1.17 update - no longer logically applies
|
Removed during 1.17 update - no longer logically applies
|
||||||
|
not true? blockEntityTickers and pendingBlockEntityTickers have similar logic applied to them
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index f7eddb39985072afeb79ec0cbfc084d7e84638e6..bb99d9fe5e274318d8480a6de2c45b0a57351f77 100644
|
index f7eddb39985072afeb79ec0cbfc084d7e84638e6..bb99d9fe5e274318d8480a6de2c45b0a57351f77 100644
|
||||||
|
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Delay unsafe actions until after entity ticking is done
|
||||||
|
|
||||||
This will help prevent many cases of unregistering entities during entity ticking
|
This will help prevent many cases of unregistering entities during entity ticking
|
||||||
|
|
||||||
1.17: Not used anywhere in 1.16.5 server, and no more tickingEntities bool on ServerLevel
|
1.17: Not used anywhere in 1.16.5 server, and no more tickingEntities bool on ServerLevel (moved to Level?)
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index 4e75cc5e52a5295e32ccadb371702a405bb518bb..b9978d296b83e73d3395b8254c0e8ccd9b36d0fa 100644
|
index 4e75cc5e52a5295e32ccadb371702a405bb518bb..b9978d296b83e73d3395b8254c0e8ccd9b36d0fa 100644
|
||||||
|
|
|
@ -10,6 +10,8 @@ Also add debug if something else tries to, and abort before world gets bad state
|
||||||
In 1.17 the entire entity state manager was rewritten. no longer applies, needs
|
In 1.17 the entire entity state manager was rewritten. no longer applies, needs
|
||||||
further information on new state manager
|
further information on new state manager
|
||||||
|
|
||||||
|
similar check added by mojang
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index 0a613f94d1c796267636e1a343aeee65a49ffed5..335928d60dbfc07644ffeab366900c5e77e99d56 100644
|
index 0a613f94d1c796267636e1a343aeee65a49ffed5..335928d60dbfc07644ffeab366900c5e77e99d56 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@ -6,6 +6,9 @@ Subject: [PATCH] Cache user authenticator threads
|
||||||
|
|
||||||
TODO it looks like someone royally messed this one up, patch name doesn't remotely
|
TODO it looks like someone royally messed this one up, patch name doesn't remotely
|
||||||
describe contents. Good thing this patch is no longer relevant at all
|
describe contents. Good thing this patch is no longer relevant at all
|
||||||
|
|
||||||
|
no remove queue anymore
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||||||
index 0597c0c3e881dd43cf91bd3088ed30dfecfe8098..175bf535066afc42de8a3f0d11c46af66f3e3e52 100644
|
index 0597c0c3e881dd43cf91bd3088ed30dfecfe8098..175bf535066afc42de8a3f0d11c46af66f3e3e52 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
|
@ -3,6 +3,7 @@ From: Aikar <aikar@aikar.co>
|
||||||
Date: Wed, 29 Nov 2017 22:18:54 -0500
|
Date: Wed, 29 Nov 2017 22:18:54 -0500
|
||||||
Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
|
Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
|
||||||
Not needed anymore
|
Not needed anymore
|
||||||
|
similar check added by Mojang
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/TemptGoal.java
|
||||||
index 186025458e923d153e9e47c2be147a9bb53db517..11ca6a752bac4ba4bc683bef844d204b739fab63 100644
|
index 186025458e923d153e9e47c2be147a9bb53db517..11ca6a752bac4ba4bc683bef844d204b739fab63 100644
|
|
@ -6,6 +6,8 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative
|
||||||
|
|
||||||
1.17 update note: Likely fixed in 1.17
|
1.17 update note: Likely fixed in 1.17
|
||||||
|
|
||||||
|
fixed https://bugs.mojang.com/browse/MC-114618
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
|
diff --git a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
|
||||||
index 4733f74ff028c03a60b73280caf9e4d1e2f0ca30..882c216b508a8623c2393b668cff6d702fe738b9 100644
|
index 4733f74ff028c03a60b73280caf9e4d1e2f0ca30..882c216b508a8623c2393b668cff6d702fe738b9 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
|
--- a/src/main/java/net/minecraft/world/entity/AreaEffectCloud.java
|
|
@ -2,7 +2,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Shane Freeder <theboyetronic@gmail.com>
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||||||
Date: Mon, 10 Jun 2019 09:36:40 +0100
|
Date: Mon, 10 Jun 2019 09:36:40 +0100
|
||||||
Subject: [PATCH] Catch exceptions from dispenser entity spawns
|
Subject: [PATCH] Catch exceptions from dispenser entity spawns
|
||||||
|
mojang(?) added similar warning
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java
|
||||||
index dccf689d17bb5a77abf97779663413d01e840c23..67a894a185a3d4a53b3c7f90174b2604dff18257 100644
|
index dccf689d17bb5a77abf97779663413d01e840c23..67a894a185a3d4a53b3c7f90174b2604dff18257 100644
|
||||||
|
|
|
@ -9,7 +9,9 @@ extra array with List.toArray() with is a costly and unneccessary
|
||||||
operation. This patch will reduce the load of plugins which for example
|
operation. This patch will reduce the load of plugins which for example
|
||||||
implement custom moblimits and depend on Chunk.getEntities().
|
implement custom moblimits and depend on Chunk.getEntities().
|
||||||
|
|
||||||
1.17: needs to be reworked, entities not in chunk anymore?
|
1.17: needs to be reworked, entities not in chunk anymore
|
||||||
|
|
||||||
|
no longer needed as no toArray is called during getEntities due to rewrite of entity system
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
index 74bad15034d9d55fb70931f38868f812160c6305..0f45f4b2486e910d11fd94b260bcd68e49eae31e 100644
|
index 74bad15034d9d55fb70931f38868f812160c6305..0f45f4b2486e910d11fd94b260bcd68e49eae31e 100644
|
|
@ -16,6 +16,8 @@ the Dupe UUID patch, then this was the likely source of the "Ghost entities"
|
||||||
|
|
||||||
1.17: Probably not needed?
|
1.17: Probably not needed?
|
||||||
|
|
||||||
|
no longer applies as entities not stored in chunks
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||||
index 9898d5c8fab63c576831bd416ccf1854ed077b0d..c5dc41a3cf499038bd33451a189913cd3978b230 100644
|
index 9898d5c8fab63c576831bd416ccf1854ed077b0d..c5dc41a3cf499038bd33451a189913cd3978b230 100644
|
||||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
@ -3,6 +3,7 @@ From: Mariell Hoversholm <proximyst@proximyst.com>
|
||||||
Date: Fri, 14 Aug 2020 23:41:19 +0200
|
Date: Fri, 14 Aug 2020 23:41:19 +0200
|
||||||
Subject: [PATCH] Don't mark null chunk sections for block updates
|
Subject: [PATCH] Don't mark null chunk sections for block updates
|
||||||
|
|
||||||
|
no longer needed as the accessor to get chunksection handles null chunk sections
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
|
||||||
index 1f67c9c5f7161ea687983e7ae0ec7d259da9acd3..32bcc55ce15d832e2182d89acecd715947b1667d 100644
|
index 1f67c9c5f7161ea687983e7ae0ec7d259da9acd3..32bcc55ce15d832e2182d89acecd715947b1667d 100644
|
|
@ -8,6 +8,8 @@ dragon
|
||||||
|
|
||||||
1.17: Mojang fixed in 1.17(maybe before, idk)
|
1.17: Mojang fixed in 1.17(maybe before, idk)
|
||||||
|
|
||||||
|
resolved by Mojang https://bugs.mojang.com/browse/MCPE-64818
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||||
index ec9436005a3a6fdfb4783d1092bb361224eb6414..b224a630f8adb1fa357c838e6b32c784aed0b15b 100644
|
index ec9436005a3a6fdfb4783d1092bb361224eb6414..b224a630f8adb1fa357c838e6b32c784aed0b15b 100644
|
||||||
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
|
@ -4,6 +4,8 @@ Date: Fri, 14 Aug 2020 23:59:26 +0200
|
||||||
Subject: [PATCH] Remove armour stand double add to world
|
Subject: [PATCH] Remove armour stand double add to world
|
||||||
1.17 Update: YEET (?)
|
1.17 Update: YEET (?)
|
||||||
|
|
||||||
|
Applied by Mojang
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/item/ArmorStandItem.java b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
|
diff --git a/src/main/java/net/minecraft/world/item/ArmorStandItem.java b/src/main/java/net/minecraft/world/item/ArmorStandItem.java
|
||||||
index a2dfcaac8a2a4a69e703de43be76d4fe369fd647..bed063497bb593683ea384605ae1a71a68f4fc1b 100644
|
index a2dfcaac8a2a4a69e703de43be76d4fe369fd647..bed063497bb593683ea384605ae1a71a68f4fc1b 100644
|
||||||
--- a/src/main/java/net/minecraft/world/item/ArmorStandItem.java
|
--- a/src/main/java/net/minecraft/world/item/ArmorStandItem.java
|
|
@ -5,6 +5,7 @@ Subject: [PATCH] Fix MC-99259 Wither Boss Bar doesn't update until
|
||||||
1.17 Update: This issue is marked as fixed on 1.17 - yeet!
|
1.17 Update: This issue is marked as fixed on 1.17 - yeet!
|
||||||
invulnerability period is over
|
invulnerability period is over
|
||||||
|
|
||||||
|
Resolved https://bugs.mojang.com/browse/MC-99259
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
|
||||||
index edd231568b75330d0cffbecb03a7e9dbc55d5f94..1f330d852eb9b3a36570542e10a88ae065798714 100644
|
index edd231568b75330d0cffbecb03a7e9dbc55d5f94..1f330d852eb9b3a36570542e10a88ae065798714 100644
|
|
@ -5,6 +5,8 @@ Subject: [PATCH] Fix MC-197271
|
||||||
Update 1.17: Fixed in openj9-0.23.0-m2 release
|
Update 1.17: Fixed in openj9-0.23.0-m2 release
|
||||||
This patch only fixes an issue for servers running OpenJ9.
|
This patch only fixes an issue for servers running OpenJ9.
|
||||||
|
|
||||||
|
resolved https://bugs.mojang.com/browse/MC-197271
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/data/BuiltinRegistries.java b/src/main/java/net/minecraft/data/BuiltinRegistries.java
|
diff --git a/src/main/java/net/minecraft/data/BuiltinRegistries.java b/src/main/java/net/minecraft/data/BuiltinRegistries.java
|
||||||
index d64cebb4431664762a14670c7d9d782dd7894ed5..0c403ea85f7ea20f2f978e06313f8675abf204b6 100644
|
index d64cebb4431664762a14670c7d9d782dd7894ed5..0c403ea85f7ea20f2f978e06313f8675abf204b6 100644
|
||||||
--- a/src/main/java/net/minecraft/data/BuiltinRegistries.java
|
--- a/src/main/java/net/minecraft/data/BuiltinRegistries.java
|
|
@ -8,6 +8,8 @@ use one.
|
||||||
|
|
||||||
This will retry as name if type is asked for and not found.
|
This will retry as name if type is asked for and not found.
|
||||||
|
|
||||||
|
resolved https://bugs.mojang.com/browse/MC-197883
|
||||||
|
|
||||||
diff --git a/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java b/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java
|
diff --git a/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java b/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java
|
||||||
index de7d1e5e0319c65775d932144c268c2d55bb7dc7..bd6a0e1b5454e880a4f2a16be7dc8da64b73e11d 100644
|
index de7d1e5e0319c65775d932144c268c2d55bb7dc7..bd6a0e1b5454e880a4f2a16be7dc8da64b73e11d 100644
|
||||||
--- a/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java
|
--- a/src/main/java/com/mojang/serialization/codecs/KeyDispatchCodec.java
|
|
@ -3,7 +3,7 @@ From: chickeneer <emcchickeneer@gmail.com>
|
||||||
Date: Wed, 18 Mar 2020 00:07:46 -0500
|
Date: Wed, 18 Mar 2020 00:07:46 -0500
|
||||||
Subject: [PATCH] MC-147729: Drop items that are extra from a crafting recipe
|
Subject: [PATCH] MC-147729: Drop items that are extra from a crafting recipe
|
||||||
|
|
||||||
1.17: Issue seems to be fixed (source: Mojira)
|
1.17: Issue seems to be fixed (source: Mojira) https://bugs.mojang.com/browse/MC-147729
|
||||||
|
|
||||||
diff --git a/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java b/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java
|
diff --git a/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java b/src/main/java/net/minecraft/recipebook/ServerPlaceRecipe.java
|
||||||
index a18aa176850bef45afcaf5742e9afbfa39281e22..c6ba6aabf94c26cccbd14689ea32373c17bbccc4 100644
|
index a18aa176850bef45afcaf5742e9afbfa39281e22..c6ba6aabf94c26cccbd14689ea32373c17bbccc4 100644
|
Loading…
Reference in New Issue