Skip to content

Commit ea1efef

Browse files
authored
Remove Patches (#7541)
1 parent 1790528 commit ea1efef

File tree

857 files changed

+274
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

857 files changed

+274
-268
lines changed

patches/server/0025-Remove-invalid-mob-spawner-tile-entities.patch renamed to patches/removed/1.18.2/0025-Remove-invalid-mob-spawner-tile-entities.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ From: Byteflux <byte@byteflux.net>
33
Date: Tue, 1 Mar 2016 15:08:03 -0600
44
Subject: [PATCH] Remove invalid mob spawner tile entities
55

6+
Minecraft checks if the block is able to hold a tile entity higher up, preventing them from ever
7+
being added to the world.
68

79
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
810
index 5496c9ae4af9658164098356532da47351808b51..2ca41f90b6b50c254a6e34da00f287197c81d65e 100644
File renamed without changes.

patches/server/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch renamed to patches/removed/1.18.2/0108-Remove-FishingHook-reference-on-Craft-Entity-removal.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Date: Thu, 16 Jun 2016 00:17:23 -0400
44
Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
55

66
TODO 1.17 isn't this supposed to be applied to when the fish hook is removed _in general_? Not just in Bukkit api calls?
7+
No longer needed, fishing is set to null when FishingHook is removed.
78

89
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java
910
index 6bfa984781a483d048ef4318761203c701d8a632..3c18712040da8d6ece24fd817b7846836b8353c1 100644

patches/server/0109-Option-to-remove-corrupt-tile-entities.patch renamed to patches/removed/1.18.2/0109-Option-to-remove-corrupt-tile-entities.patch

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ From: Zach Brown <zach.brown@destroystokyo.com>
33
Date: Wed, 5 Oct 2016 16:27:36 -0500
44
Subject: [PATCH] Option to remove corrupt tile entities
55

6+
Corrupt tile entities are never added to the world in the first place anymore.
67

78
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
89
index d7734fbc6b684b14bc32c94e65947fb41aae126a..80345730b8ccc11d3d0833485d25b03f614aeee2 100644

patches/server/0115-Don-t-let-fishinghooks-use-portals.patch renamed to patches/removed/1.18.2/0115-Don-t-let-fishinghooks-use-portals.patch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ From: Zach Brown <zach.brown@destroystokyo.com>
33
Date: Fri, 16 Dec 2016 16:03:19 -0600
44
Subject: [PATCH] Don't let fishinghooks use portals
55

6+
Fishing hooks have canChangeDimensions to false, preventing them from being able to switch dimensions
7+
via portals.
68

79
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
810
index 24192a91d9f5c890a316ec150d4aec84073cb61a..3b23279ce994b9684dbc10157839f5fc47edfabd 100644
File renamed without changes.
File renamed without changes.

patches/server/0028-Entity-Origin-API.patch renamed to patches/server/0027-Entity-Origin-API.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ index 8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec..a4cd7088113b60fd10e79359e5749fd1
9494
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
9595
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
9696
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
97-
index 8e7479afd3579e6b732feca059c1e4df1160e450..2bc46e02779d22adedc1fd9e5c9130c209bd58f7 100644
97+
index de98cbe9e863a19f71783980417fb32646102c9e..16b029f08d5c9dfd3bc4ad304ab9d339ad20b232 100644
9898
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
9999
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
100100
@@ -330,6 +330,14 @@ public class FallingBlockEntity extends Entity {

patches/server/0029-Prevent-tile-entity-and-entity-crashes.patch renamed to patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ index a35e3f54cbec83e8c691b6f61d4e1ac1ece6156d..5c2ac7a1de96d9b4830955c2ff108c08
4444
}
4545
}
4646
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
47-
index 2ca41f90b6b50c254a6e34da00f287197c81d65e..98fe6a1d2866d029383a5a5d60a2635d2d421f1e 100644
47+
index 5496c9ae4af9658164098356532da47351808b51..ed6203119fe2e4ee47a2d51c84df5b7c236f32da 100644
4848
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
4949
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
50-
@@ -1029,11 +1029,11 @@ public class LevelChunk extends ChunkAccess {
50+
@@ -1024,11 +1024,11 @@ public class LevelChunk extends ChunkAccess {
5151

5252
gameprofilerfiller.pop();
5353
} catch (Throwable throwable) {
File renamed without changes.

0 commit comments

Comments
 (0)