Update Paper

AtlasMediaGroup · Jun 16, 2024 · 32cf791 · 32cf791
1 parent 0870033
commit 32cf791
Show file tree

Hide file tree

Showing 40 changed files with 7 additions and 187 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=f4c7d373e4a1aff23539fe099745bf29a28559b9
+paperRef=ba31f4128208e954d6648001724887352f71ece9
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0013-Block-server-side-chunkbans.patch b/patches/server/0013-Block-server-side-chunkbans.patch
diff --git a/...s-with-invalid-namespaces-from-bein.patch → ...s-with-invalid-namespaces-from-bein.patch b/...s-with-invalid-namespaces-from-bein.patch → ...s-with-invalid-namespaces-from-bein.patch
diff --git a/...ry-player-data-in-the-nbt-component.patch → ...ry-player-data-in-the-nbt-component.patch b/...ry-player-data-in-the-nbt-component.patch → ...ry-player-data-in-the-nbt-component.patch
diff --git a/...tring-tag-visitors-to-1024-elements.patch → ...tring-tag-visitors-to-1024-elements.patch b/...tring-tag-visitors-to-1024-elements.patch → ...tring-tag-visitors-to-1024-elements.patch
diff --git a/...lling-potion-effects-and-certain-po.patch → ...lling-potion-effects-and-certain-po.patch b/...lling-potion-effects-and-certain-po.patch → ...lling-potion-effects-and-certain-po.patch
diff --git a/...erver/0018-Fix-negative-death-times.patch → ...erver/0017-Fix-negative-death-times.patch b/...erver/0018-Fix-negative-death-times.patch → ...erver/0017-Fix-negative-death-times.patch
diff --git a/...ehicle-collision-checks-to-3-and-di.patch → ...ehicle-collision-checks-to-3-and-di.patch b/...ehicle-collision-checks-to-3-and-di.patch → ...ehicle-collision-checks-to-3-and-di.patch
diff --git a/...Add-custom-classes-used-by-Scissors.patch → ...Add-custom-classes-used-by-Scissors.patch b/...Add-custom-classes-used-by-Scissors.patch → ...Add-custom-classes-used-by-Scissors.patch
diff --git a/...-Don-t-log-invalid-teams-to-console.patch → ...-Don-t-log-invalid-teams-to-console.patch b/...-Don-t-log-invalid-teams-to-console.patch → ...-Don-t-log-invalid-teams-to-console.patch
diff --git a/...-bounds-HangingEntity-crash-exploit.patch → ...-bounds-HangingEntity-crash-exploit.patch b/...-bounds-HangingEntity-crash-exploit.patch → ...-bounds-HangingEntity-crash-exploit.patch
diff --git a/...erver/0023-Add-MasterBlockFireEvent.patch → ...erver/0022-Add-MasterBlockFireEvent.patch b/...erver/0023-Add-MasterBlockFireEvent.patch → ...erver/0022-Add-MasterBlockFireEvent.patch
diff --git a/patches/server/0024-Reset-large-tags.patch → patches/server/0023-Reset-large-tags.patch b/patches/server/0024-Reset-large-tags.patch → patches/server/0023-Reset-large-tags.patch
diff --git a/...r/0025-Add-spectator-teleport-event.patch → ...r/0024-Add-spectator-teleport-event.patch b/...r/0025-Add-spectator-teleport-event.patch → ...r/0024-Add-spectator-teleport-event.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add spectator teleport event
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 860d33ac56680babd87358b1d7d2216dac3f7865..a60f594b3d7c8c30344f5e888e4309b8f75fdeaf 100644
+index fe2ef36ab5dc4b933abf24dbfd0e811c53239cf0..f14e5f5867b0319c1f3f25ac607ac5e2b0992991 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,5 +1,6 @@

diff --git a/...26-Prevent-invalid-container-events.patch → ...25-Prevent-invalid-container-events.patch b/...26-Prevent-invalid-container-events.patch → ...25-Prevent-invalid-container-events.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent invalid container events
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a60f594b3d7c8c30344f5e888e4309b8f75fdeaf..cfe4f98458c1b1fd311535552b99937d1f319c0e 100644
+index f14e5f5867b0319c1f3f25ac607ac5e2b0992991..4582ef637075e64c0b6ff234d3c0cd30ba074b38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -29,6 +29,7 @@ import java.util.function.UnaryOperator;

diff --git a/...unning-commands-in-books-by-default.patch → ...unning-commands-in-books-by-default.patch b/...unning-commands-in-books-by-default.patch → ...unning-commands-in-books-by-default.patch
diff --git a/...k-entity-entity-tag-query-positions.patch → ...k-entity-entity-tag-query-positions.patch b/...k-entity-entity-tag-query-positions.patch → ...k-entity-entity-tag-query-positions.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Validate block entity/entity tag query positions
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index cfe4f98458c1b1fd311535552b99937d1f319c0e..adbb1036913ba6299f2093c84480e4147a36b344 100644
+index 4582ef637075e64c0b6ff234d3c0cd30ba074b38..80f0f88258770862f419e4faba4cfca4c0457b2c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1278,7 +1278,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...-legacy-messages-over-1k-characters.patch → ...-legacy-messages-over-1k-characters.patch b/...-legacy-messages-over-1k-characters.patch → ...-legacy-messages-over-1k-characters.patch
diff --git a/...ents-on-Signs-bypassing-permissions.patch → ...ents-on-Signs-bypassing-permissions.patch b/...ents-on-Signs-bypassing-permissions.patch → ...ents-on-Signs-bypassing-permissions.patch
diff --git a/...server/0031-Prevent-velocity-freeze.patch → ...server/0030-Prevent-velocity-freeze.patch b/...server/0031-Prevent-velocity-freeze.patch → ...server/0030-Prevent-velocity-freeze.patch
diff --git a/...Patch-large-selector-distance-crash.patch → ...Patch-large-selector-distance-crash.patch b/...Patch-large-selector-distance-crash.patch → ...Patch-large-selector-distance-crash.patch
diff --git a/...ch-invalid-entity-rotation-log-spam.patch → ...ch-invalid-entity-rotation-log-spam.patch b/...ch-invalid-entity-rotation-log-spam.patch → ...ch-invalid-entity-rotation-log-spam.patch
diff --git a/...mit-sculk-catalyst-cursor-positions.patch → ...mit-sculk-catalyst-cursor-positions.patch b/...mit-sculk-catalyst-cursor-positions.patch → ...mit-sculk-catalyst-cursor-positions.patch
diff --git a/...n-option-to-disable-chat-signatures.patch → ...n-option-to-disable-chat-signatures.patch b/...n-option-to-disable-chat-signatures.patch → ...n-option-to-disable-chat-signatures.patch
diff --git a/...s/server/0036-Limit-map-decorations.patch → ...s/server/0035-Limit-map-decorations.patch b/...s/server/0036-Limit-map-decorations.patch → ...s/server/0035-Limit-map-decorations.patch
diff --git a/...layer-banning-using-duplicate-UUIDs.patch → ...layer-banning-using-duplicate-UUIDs.patch b/...layer-banning-using-duplicate-UUIDs.patch → ...layer-banning-using-duplicate-UUIDs.patch
diff --git a/...on-t-warn-on-duplicate-entity-UUIDs.patch → ...on-t-warn-on-duplicate-entity-UUIDs.patch b/...on-t-warn-on-duplicate-entity-UUIDs.patch → ...on-t-warn-on-duplicate-entity-UUIDs.patch
diff --git a/...erver/0039-Limit-beacon-effectRange.patch → ...erver/0038-Limit-beacon-effectRange.patch b/...erver/0039-Limit-beacon-effectRange.patch → ...erver/0038-Limit-beacon-effectRange.patch
diff --git a/...ove-validation-of-ResourceLocations.patch → ...ove-validation-of-ResourceLocations.patch b/...ove-validation-of-ResourceLocations.patch → ...ove-validation-of-ResourceLocations.patch
diff --git a/...n-t-log-on-too-many-chained-updates.patch → ...n-t-log-on-too-many-chained-updates.patch b/...n-t-log-on-too-many-chained-updates.patch → ...n-t-log-on-too-many-chained-updates.patch
diff --git a/...042-Fix-packet-related-lag-exploits.patch → ...041-Fix-packet-related-lag-exploits.patch b/...042-Fix-packet-related-lag-exploits.patch → ...041-Fix-packet-related-lag-exploits.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix packet-related lag exploits
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a..88c98ba7673808819b8f85876f22743bc3a4f471 100644
+index c0aa9520d547d6d77169fd1dbb02844b90ef4a1d..843793437737305bbdec598326a813f84b820d12 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -865,7 +865,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...0043-Implement-command-block-events.patch → ...0042-Implement-command-block-events.patch b/...0043-Implement-command-block-events.patch → ...0042-Implement-command-block-events.patch
@@ -18,7 +18,7 @@ index c99fc118013cb3d4043638e2001a8297e79ddf9c..cdaa81e1f2167b29ec01cc25e51a8400
      private final boolean trackOutput;
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 88c98ba7673808819b8f85876f22743bc3a4f471..f96c0c5007d9e1d86bfe27518815dc798e431c6a 100644
+index 843793437737305bbdec598326a813f84b820d12..bbe76d46b599fb2f8211f3e62a76430db120f66f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1,6 +1,8 @@

diff --git a/...-Limit-save-data-for-Bees-and-Vexes.patch → ...-Limit-save-data-for-Bees-and-Vexes.patch b/...-Limit-save-data-for-Bees-and-Vexes.patch → ...-Limit-save-data-for-Bees-and-Vexes.patch
diff --git a/...server/0045-Add-depth-limit-to-SNBT.patch → ...server/0044-Add-depth-limit-to-SNBT.patch b/...server/0045-Add-depth-limit-to-SNBT.patch → ...server/0044-Add-depth-limit-to-SNBT.patch
diff --git a/...server/0046-Mute-invalid-attributes.patch → ...server/0045-Mute-invalid-attributes.patch b/...server/0046-Mute-invalid-attributes.patch → ...server/0045-Mute-invalid-attributes.patch
diff --git a/...047-Mute-invalid-Enderdragon-phases.patch → ...046-Mute-invalid-Enderdragon-phases.patch b/...047-Mute-invalid-Enderdragon-phases.patch → ...046-Mute-invalid-Enderdragon-phases.patch
@@ -18,7 +18,7 @@ index 1b1a210a86121049e507a497649727a99452c0a2..a8bcadbf64d5034b172427e16b1468b4
          } else if (this.timeSinceCharge > 0 && this.timeSinceCharge++ >= 10) {
              this.dragon.getPhaseManager().setPhase(EnderDragonPhase.HOLDING_PATTERN);
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
-index 13f60a16f07c50a278b158d64180009020a4dca6..289361cbaad2ca6392ee66627becb8f973bb1e54 100644
+index c5269c3117901b8521720d1b32689d7f600f20a3..3a8839ee4cb8cafb927ad49a9e8f9a2955eef973 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java
 @@ -31,7 +31,7 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance {

diff --git a/...dd-length-limit-to-note-block-sound.patch → ...dd-length-limit-to-note-block-sound.patch b/...dd-length-limit-to-note-block-sound.patch → ...dd-length-limit-to-note-block-sound.patch
diff --git a/.../0049-Change-version-fetcher-to-AMG.patch → .../0048-Change-version-fetcher-to-AMG.patch b/.../0049-Change-version-fetcher-to-AMG.patch → .../0048-Change-version-fetcher-to-AMG.patch
diff --git a/...-limit-to-Component-deserialization.patch → ...-limit-to-Component-deserialization.patch b/...-limit-to-Component-deserialization.patch → ...-limit-to-Component-deserialization.patch
diff --git a/...limit-to-updateCustomBlockEntityTag.patch → ...limit-to-updateCustomBlockEntityTag.patch b/...limit-to-updateCustomBlockEntityTag.patch → ...limit-to-updateCustomBlockEntityTag.patch