drop exact choice recipe book clicks patch, supercedes #1446

not sure how i missed this when upstreaming
PurpurMC · Oct 15, 2023 · ad03187 · ad03187
1 parent f898434
commit ad03187
Show file tree

Hide file tree

Showing 42 changed files with 10 additions and 139 deletions.
diff --git a/...er/0264-Allow-custom-ChatDecorators.patch → ...er/0263-Allow-custom-ChatDecorators.patch b/...er/0264-Allow-custom-ChatDecorators.patch → ...er/0263-Allow-custom-ChatDecorators.patch
diff --git a/patches/server/0263-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0263-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch
diff --git a/patches/server/0265-Remove-Timings.patch → patches/server/0264-Remove-Timings.patch b/patches/server/0265-Remove-Timings.patch → patches/server/0264-Remove-Timings.patch
diff --git a/.../server/0266-Remove-Mojang-Profiler.patch → .../server/0265-Remove-Mojang-Profiler.patch b/.../server/0266-Remove-Mojang-Profiler.patch → .../server/0265-Remove-Mojang-Profiler.patch
diff --git a/...r-output-for-invalid-movement-kicks.patch → ...r-output-for-invalid-movement-kicks.patch b/...r-output-for-invalid-movement-kicks.patch → ...r-output-for-invalid-movement-kicks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9fa25455dd264ea0b58d5e1825fd88475021dea9..0d79a045ae1f28f07f1b052ba014bbf372217dba 100644
+index d01116aa7b547e5020b69df36cdf035af2cae882..0ee059162e65a95db2f2e3473d2dbf0de38859da 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -736,6 +736,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/patches/server/0268-Add-Bee-API.patch → patches/server/0267-Add-Bee-API.patch b/patches/server/0268-Add-Bee-API.patch → patches/server/0267-Add-Bee-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Bee API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index e837500019157129007841c847d807ebae10db04..6c04c8e7776b2830ac368229da834532e8ce163e 100644
+index 02e95af3c18b3da5a6a32a7536e903ca9c426249..38a3dcec138d9233a46e5d523bcc6d64bc7fffd0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -807,6 +807,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {

diff --git a/patches/server/0269-Debug-Marker-API.patch → patches/server/0268-Debug-Marker-API.patch b/patches/server/0269-Debug-Marker-API.patch → patches/server/0268-Debug-Marker-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 12b25d353990b6bcca3772c07ebe6472944b3166..c600c3579747281a7e463ea4dcb9335d8936f2e3 100644
+index 2ec27193ea3444de71c05949952cc129eed4ea0c..207b502c8df60357971e69263c1d1496b83391ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1543,6 +1543,42 @@ public final class CraftServer implements Server {
@@ -99,7 +99,7 @@ index 791e69b2c963cd034d6d35561448cdb20b1b1cde..52b48e40c3ee5f483c6cb04409459cf2
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 19f6bad1b81c5a5c249631b43e1f6c159dc994e0..3c543e3972035e0c7a1c93e2f881e2ab0205afa0 100644
+index a03f60665059f96fc546e880c29d3bb7b04ca67c..f7fd1c4d8875bb3807172c45367465c4f9962176 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3335,5 +3335,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

diff --git a/...g-option-to-ignore-creative-players.patch → ...g-option-to-ignore-creative-players.patch b/...g-option-to-ignore-creative-players.patch → ...g-option-to-ignore-creative-players.patch
diff --git a/...71-Add-skeleton-bow-accuracy-option.patch → ...70-Add-skeleton-bow-accuracy-option.patch b/...71-Add-skeleton-bow-accuracy-option.patch → ...70-Add-skeleton-bow-accuracy-option.patch
diff --git a/.../server/0272-Allay-respect-item-NBT.patch → .../server/0271-Allay-respect-item-NBT.patch b/.../server/0272-Allay-respect-item-NBT.patch → .../server/0271-Allay-respect-item-NBT.patch
diff --git a/...es/server/0273-Add-death-screen-API.patch → ...es/server/0272-Add-death-screen-API.patch b/...es/server/0273-Add-death-screen-API.patch → ...es/server/0272-Add-death-screen-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3c543e3972035e0c7a1c93e2f881e2ab0205afa0..28910943e5efcdf24865b961fba161b7d1e4a8f5 100644
+index f7fd1c4d8875bb3807172c45367465c4f9962176..b6515c469ae3ff06daf631f0d5e5f792b41f8e48 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3373,5 +3373,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

diff --git a/...4-Implement-ram-and-rambar-commands.patch → ...3-Implement-ram-and-rambar-commands.patch b/...4-Implement-ram-and-rambar-commands.patch → ...3-Implement-ram-and-rambar-commands.patch
diff --git a/...275-Add-item-packet-serialize-event.patch → ...274-Add-item-packet-serialize-event.patch b/...275-Add-item-packet-serialize-event.patch → ...274-Add-item-packet-serialize-event.patch
@@ -48,7 +48,7 @@ index 189c904a3b0ac2d2b889e118bfd7c75e6ec5da3e..9c4cec7cf323f6768a89358fa1a11b53
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0d79a045ae1f28f07f1b052ba014bbf372217dba..ee9845804d2ad59bdde78e778c28690746877541 100644
+index 0ee059162e65a95db2f2e3473d2dbf0de38859da..d3827d918ee1f748e936dd3b05b2021a3a0f88c4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3361,6 +3361,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...n-to-fix-MC-3304-projectile-looting.patch → ...n-to-fix-MC-3304-projectile-looting.patch b/...n-to-fix-MC-3304-projectile-looting.patch → ...n-to-fix-MC-3304-projectile-looting.patch
diff --git a/...Configurable-block-blast-resistance.patch → ...Configurable-block-blast-resistance.patch b/...Configurable-block-blast-resistance.patch → ...Configurable-block-blast-resistance.patch
diff --git a/...gurable-block-fall-damage-modifiers.patch → ...gurable-block-fall-damage-modifiers.patch b/...gurable-block-fall-damage-modifiers.patch → ...gurable-block-fall-damage-modifiers.patch
diff --git a/patches/server/0279-Language-API.patch → patches/server/0278-Language-API.patch b/patches/server/0279-Language-API.patch → patches/server/0278-Language-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Language API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8632e9cab6563b9ea0a01c2e5248ad658129d5ce..aea87307b318ed34e60835ba1d9420e9a0fd4d8e 100644
+index 207b502c8df60357971e69263c1d1496b83391ba..a510aba99702172060916f6b58e4d6f3e066fb73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -399,6 +399,20 @@ public final class CraftServer implements Server {

diff --git a/.../0280-Milk-Keeps-Beneficial-Effects.patch → .../0279-Milk-Keeps-Beneficial-Effects.patch b/.../0280-Milk-Keeps-Beneficial-Effects.patch → .../0279-Milk-Keeps-Beneficial-Effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7bace36fb2c447cc2c7d07777a910c5867bbfe99..4604e63cec3c25a1257892d4c1ea9db098815b93 100644
+index c132ab8142bf55f2ab00617b7ba90c610016ae7d..9bb693aa505eae2236d8b37e4d42a11445227643 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1125,6 +1125,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

diff --git a/...s-not-looking-up-and-down-when-stra.patch → ...s-not-looking-up-and-down-when-stra.patch b/...s-not-looking-up-and-down-when-stra.patch → ...s-not-looking-up-and-down-when-stra.patch
diff --git a/...d-log-suppression-for-LibraryLoader.patch → ...d-log-suppression-for-LibraryLoader.patch b/...d-log-suppression-for-LibraryLoader.patch → ...d-log-suppression-for-LibraryLoader.patch
diff --git a/...ow-creeper-to-encircle-target-when-.patch → ...ow-creeper-to-encircle-target-when-.patch b/...ow-creeper-to-encircle-target-when-.patch → ...ow-creeper-to-encircle-target-when-.patch
diff --git a/patches/server/0284-Fire-Immunity-API.patch → patches/server/0283-Fire-Immunity-API.patch b/patches/server/0284-Fire-Immunity-API.patch → patches/server/0283-Fire-Immunity-API.patch
@@ -50,7 +50,7 @@ index 6e0331818ef68fa355e3c27dc3e362b82d1c6e3a..5fa044b03f0a08d1e17b9002255e2e64
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 431e3cedde33b33202be1d44bf066323997f21f8..236d753266943d8c64e1329336d28c50109d0886 100644
+index eb409ecf5bf06692038e9fe84af986092a7d7837..4482e9401be4af7b16991f37d319e90602af2227 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -223,6 +223,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

diff --git a/...eport-to-spawn-on-nether-ceiling-da.patch → ...eport-to-spawn-on-nether-ceiling-da.patch b/...eport-to-spawn-on-nether-ceiling-da.patch → ...eport-to-spawn-on-nether-ceiling-da.patch
diff --git a/...hes/server/0286-Added-got-ram-event.patch → ...hes/server/0285-Added-got-ram-event.patch b/...hes/server/0286-Added-got-ram-event.patch → ...hes/server/0285-Added-got-ram-event.patch
diff --git a/.../0287-Log-skipped-entity-s-position.patch → .../0286-Log-skipped-entity-s-position.patch b/.../0287-Log-skipped-entity-s-position.patch → .../0286-Log-skipped-entity-s-position.patch
diff --git a/...es/server/0288-End-Crystal-Cramming.patch → ...es/server/0287-End-Crystal-Cramming.patch b/...es/server/0288-End-Crystal-Cramming.patch → ...es/server/0287-End-Crystal-Cramming.patch
diff --git a/...eacon-effects-when-covered-by-tinte.patch → ...eacon-effects-when-covered-by-tinte.patch b/...eacon-effects-when-covered-by-tinte.patch → ...eacon-effects-when-covered-by-tinte.patch
diff --git a/...ute-clamping-and-armor-limit-config.patch → ...ute-clamping-and-armor-limit-config.patch b/...ute-clamping-and-armor-limit-config.patch → ...ute-clamping-and-armor-limit-config.patch
diff --git a/...ig-to-remove-explosion-radius-clamp.patch → ...ig-to-remove-explosion-radius-clamp.patch b/...ig-to-remove-explosion-radius-clamp.patch → ...ig-to-remove-explosion-radius-clamp.patch
diff --git a/...ble-sugarcane-cactus-and-netherwart.patch → ...ble-sugarcane-cactus-and-netherwart.patch b/...ble-sugarcane-cactus-and-netherwart.patch → ...ble-sugarcane-cactus-and-netherwart.patch
diff --git a/...es/server/0293-Add-PreExplodeEvents.patch → ...es/server/0292-Add-PreExplodeEvents.patch b/...es/server/0293-Add-PreExplodeEvents.patch → ...es/server/0292-Add-PreExplodeEvents.patch
diff --git a/...4-Improve-output-of-plugins-command.patch → ...3-Improve-output-of-plugins-command.patch b/...4-Improve-output-of-plugins-command.patch → ...3-Improve-output-of-plugins-command.patch
diff --git a/.../server/0295-Add-mending-multiplier.patch → .../server/0294-Add-mending-multiplier.patch b/.../server/0295-Add-mending-multiplier.patch → .../server/0294-Add-mending-multiplier.patch
diff --git a/...es/server/0296-Make-GUI-Great-Again.patch → ...es/server/0295-Make-GUI-Great-Again.patch b/...es/server/0296-Make-GUI-Great-Again.patch → ...es/server/0295-Make-GUI-Great-Again.patch
@@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..15a226e3854d731f7724025ea3459c8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6656a3f4dd78270690479639c738fdd0ec7e588d..6e9061dd6d5fd35d74d02c25a5985ffc5bc8e5ac 100644
+index da64482a95892dd06ef975767d68bab454ae1dc8..e2c74460d149360f01c4d0577054879f2601a58f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -99,6 +99,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

diff --git a/patches/server/0297-Stored-Bee-API.patch → patches/server/0296-Stored-Bee-API.patch b/patches/server/0297-Stored-Bee-API.patch → patches/server/0296-Stored-Bee-API.patch
diff --git a/...s/server/0298-Shears-can-defuse-TNT.patch → ...s/server/0297-Shears-can-defuse-TNT.patch b/...s/server/0298-Shears-can-defuse-TNT.patch → ...s/server/0297-Shears-can-defuse-TNT.patch
diff --git a/patches/server/0299-Explorer-Map-API.patch → patches/server/0298-Explorer-Map-API.patch b/patches/server/0299-Explorer-Map-API.patch → patches/server/0298-Explorer-Map-API.patch
diff --git a/...Option-Ocelot-Spawn-Under-Sea-Level.patch → ...Option-Ocelot-Spawn-Under-Sea-Level.patch b/...Option-Ocelot-Spawn-Under-Sea-Level.patch → ...Option-Ocelot-Spawn-Under-Sea-Level.patch
diff --git a/...-piglins-to-ignore-gold-trimmed-arm.patch → ...-piglins-to-ignore-gold-trimmed-arm.patch b/...-piglins-to-ignore-gold-trimmed-arm.patch → ...-piglins-to-ignore-gold-trimmed-arm.patch
diff --git a/...ways-showing-item-in-player-death-m.patch → ...ways-showing-item-in-player-death-m.patch b/...ways-showing-item-in-player-death-m.patch → ...ways-showing-item-in-player-death-m.patch
diff --git a/...0303-place-end-crystal-on-any-block.patch → ...0302-place-end-crystal-on-any-block.patch b/...0303-place-end-crystal-on-any-block.patch → ...0302-place-end-crystal-on-any-block.patch
diff --git a/...hes/server/0304-Add-hover-lines-API.patch → ...hes/server/0303-Add-hover-lines-API.patch b/...hes/server/0304-Add-hover-lines-API.patch → ...hes/server/0303-Add-hover-lines-API.patch