From ab1afb0ed8838117f00a70fcf507ffedfb00c414 Mon Sep 17 00:00:00 2001 From: Suppergerrie2 <15769860+suppergerrie2@users.noreply.github.com> Date: Fri, 15 Mar 2024 12:09:47 +0100 Subject: [PATCH 01/16] Fix missing profiler.pop() in PathFinder::findPath (#10320) --- ...mize-Pathfinder-Remove-Streams-Optimized-collect.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch index 30e9a2414650..f0c0562d7021 100644 --- a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch +++ b/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch @@ -16,7 +16,7 @@ This lets us get faster foreach iteration, as well as avoids map lookups on the values when needed. diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java -index 8519383a9abd45434c1e9888e77548941a80c79c..eb18494bd7257fa5eb00dea16cf4d5667b796f2b 100644 +index 8519383a9abd45434c1e9888e77548941a80c79c..8aa4ac3a6affbe888d6084a27b668c58dfda6c79 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java @@ -38,9 +38,12 @@ public class PathFinder { @@ -91,7 +91,7 @@ index 8519383a9abd45434c1e9888e77548941a80c79c..eb18494bd7257fa5eb00dea16cf4d566 if (node2.inOpenSet()) { this.openSet.changeCost(node2, node2.g + node2.h); } else { -@@ -105,23 +113,31 @@ public class PathFinder { +@@ -105,23 +113,32 @@ public class PathFinder { } } @@ -100,8 +100,6 @@ index 8519383a9abd45434c1e9888e77548941a80c79c..eb18494bd7257fa5eb00dea16cf4d566 - }).min(Comparator.comparingInt(Path::getNodeCount)) : set.stream().map((target) -> { - return this.reconstructPath(target.getBestNode(), positions.get(target), false); - }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount)); -- profiler.pop(); -- return optional.isEmpty() ? null : optional.get(); + // Paper start - Perf: remove streams and optimize collection + Path best = null; + boolean entryListIsEmpty = entryList.isEmpty(); @@ -112,6 +110,8 @@ index 8519383a9abd45434c1e9888e77548941a80c79c..eb18494bd7257fa5eb00dea16cf4d566 + if (best == null || comparator.compare(path, best) < 0) + best = path; + } + profiler.pop(); +- return optional.isEmpty() ? null : optional.get(); + return best; + // Paper end - Perf: remove streams and optimize collection } From cd110a8995130fbdf7981cb8fd4866e5ae2ccbf9 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Sun, 17 Mar 2024 02:56:04 +0900 Subject: [PATCH 02/16] [ci skip] Update CONTRIBUTING.md (#10318) tempermental -> temperamental --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a2fa410d3c72..19f656419d2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -319,7 +319,7 @@ Subject: [PATCH] revert serverside behavior of keepalives This patch intends to bump up the time that a client has to reply to the server back to 30 seconds as per pre 1.12.2, which allowed clients more than enough time to reply potentially allowing them to be less -tempermental due to lag spikes on the network thread, e.g. that caused +temperamental due to lag spikes on the network thread, e.g. that caused by plugins that are interacting with netty. We also add a system property to allow people to tweak how long the server From e6034867bab45fd507d68e238500bba730c6ffb9 Mon Sep 17 00:00:00 2001 From: leguan <59799222+Leguan16@users.noreply.github.com> Date: Sat, 16 Mar 2024 19:10:26 +0100 Subject: [PATCH 03/16] Add onboarding message for initial server start (#10312) --- ...ing-message-for-initial-server-start.patch | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 patches/server/1054-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch new file mode 100644 index 000000000000..744407a16a74 --- /dev/null +++ b/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch @@ -0,0 +1,103 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: leguan +Date: Sun, 10 Mar 2024 20:10:41 +0100 +Subject: [PATCH] Add onboarding message for initial server start + + +diff --git a/src/main/java/io/papermc/paper/configuration/Configurations.java b/src/main/java/io/papermc/paper/configuration/Configurations.java +index c01b4393439838976965823298f12e4762e72eff..218bf89fd7583d6db9f64754c4db8fcce5415bdb 100644 +--- a/src/main/java/io/papermc/paper/configuration/Configurations.java ++++ b/src/main/java/io/papermc/paper/configuration/Configurations.java +@@ -126,6 +126,7 @@ public abstract class Configurations { + if (Files.notExists(configFile)) { + node = CommentedConfigurationNode.root(loader.defaultOptions()); + node.node(Configuration.VERSION_FIELD).raw(this.globalConfigVersion()); ++ GlobalConfiguration.isFirstStart = true; + } else { + node = loader.load(); + this.verifyGlobalConfigVersion(node); +diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +index b53b6cc4463675096b061b3b65f14a4695c742e2..f2e30d8743a97c0541808dc5c03300c0d881b843 100644 +--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java ++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +@@ -25,6 +25,7 @@ public class GlobalConfiguration extends ConfigurationPart { + private static final Logger LOGGER = LogUtils.getLogger(); + static final int CURRENT_VERSION = 29; // (when you change the version, change the comment, so it conflicts on rebases): + private static GlobalConfiguration instance; ++ public static boolean isFirstStart = false; + public static GlobalConfiguration get() { + return instance; + } +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index d06185566b447c432d4dc2e3ba04d121bcdbc71b..93b661e9cb7743aeff7da3972942cb73049a5e4c 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -1155,6 +1155,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop " + onboardingLink + ""); ++ link.setFont(MinecraftServerGui.MONOSPACED); ++ link.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); ++ link.addMouseListener(new java.awt.event.MouseAdapter() { ++ @Override ++ public void mouseClicked(final java.awt.event.MouseEvent e) { ++ try { ++ java.awt.Desktop.getDesktop().browse(java.net.URI.create(onboardingLink)); ++ } catch (java.io.IOException exception) { ++ LOGGER.error("Unable to find a default browser. Please manually visit the website: " + onboardingLink, exception); ++ } catch (UnsupportedOperationException exception) { ++ LOGGER.error("This platform does not support the BROWSE action. Please manually visit the website: " + onboardingLink, exception); ++ } catch (SecurityException exception) { ++ LOGGER.error("This action has been denied by the security manager. Please manually visit the website: " + onboardingLink, exception); ++ } ++ } ++ }); ++ ++ jPanel.add(jLabel); ++ jPanel.add(link); ++ ++ return jPanel; ++ } ++ // Paper end - Add onboarding message for initial server start ++ + private JComponent buildPlayerPanel() { + JList jlist = new PlayerListComponent(this.server); + JScrollPane jscrollpane = new JScrollPane(jlist, 22, 30); From d361a7f60912250ceeee9461f1f97d23dd87ff76 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sat, 16 Mar 2024 11:51:22 -0700 Subject: [PATCH 04/16] Fix DamageSource API (#10307) Uses the correct entity in the EntityDamageByEntity event Returns the correct entity for API's DamageSource#getCausingEntity --- patches/api/0466-Fix-DamageSource-API.patch | 31 +++ .../server/1055-Fix-DamageSource-API.patch | 198 ++++++++++++++++++ 2 files changed, 229 insertions(+) create mode 100644 patches/api/0466-Fix-DamageSource-API.patch create mode 100644 patches/server/1055-Fix-DamageSource-API.patch diff --git a/patches/api/0466-Fix-DamageSource-API.patch b/patches/api/0466-Fix-DamageSource-API.patch new file mode 100644 index 000000000000..efe4403e2caa --- /dev/null +++ b/patches/api/0466-Fix-DamageSource-API.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 16 Mar 2024 11:21:14 -0700 +Subject: [PATCH] Fix DamageSource API + + +diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +index 6b24d1281cb8f0253430c9c1a1323e2670bb9c93..8ea4be529400b34df3d31b0f17c2d145345523d9 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +@@ -60,6 +60,20 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent { + } + // Paper end + ++ // Paper start ++ /** ++ * {@inheritDoc} ++ *

++ * The {@link DamageSource#getDirectEntity()} may be different from the {@link #getDamager()} ++ * if the Minecraft damage source did not originally include an damager entity, but one was included ++ * for this event {@link #getDamager()}. ++ */ ++ @Override ++ public @NotNull DamageSource getDamageSource() { ++ return super.getDamageSource(); ++ } ++ // Paper end ++ + /** + * Returns the entity that damaged the defender. + * diff --git a/patches/server/1055-Fix-DamageSource-API.patch b/patches/server/1055-Fix-DamageSource-API.patch new file mode 100644 index 000000000000..3c80fe5209ea --- /dev/null +++ b/patches/server/1055-Fix-DamageSource-API.patch @@ -0,0 +1,198 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 9 Mar 2024 14:13:04 -0800 +Subject: [PATCH] Fix DamageSource API + +Uses the correct entity in the EntityDamageByEntity event +Returns the correct entity for API's DamageSource#getCausingEntity + +diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java +index 1561b85a45f52a8162f43553f8485bfe084b8f1f..b26e4d58ea1898a5e4b31c3d6ab33f38835ab2c6 100644 +--- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java ++++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java +@@ -27,7 +27,8 @@ public class DamageSource { + private boolean withSweep = false; + private boolean melting = false; + private boolean poison = false; +- private Entity customCausingEntity = null; // This field is a helper for when causing entity damage is not set by vanilla ++ @Nullable ++ private Entity customEventDamager = null; // This field is a helper for when causing entity damage is not set by vanilla // Paper - fix DamageSource API + + public DamageSource sweep() { + this.withSweep = true; +@@ -56,13 +57,18 @@ public class DamageSource { + return this.poison; + } + +- public Entity getCausingEntity() { +- return (this.customCausingEntity != null) ? this.customCausingEntity : this.causingEntity; ++ // Paper start - fix DamageSource API ++ public @Nullable Entity getCustomEventDamager() { ++ return (this.customEventDamager != null) ? this.customEventDamager : this.directEntity; + } + +- public DamageSource customCausingEntity(Entity entity) { ++ public DamageSource customEventDamager(Entity entity) { ++ if (this.directEntity != null) { ++ throw new IllegalStateException("Cannot set a custom event damager entity when a direct entity is already set (report as a bug to Paper)"); ++ } + DamageSource damageSource = this.cloneInstance(); +- damageSource.customCausingEntity = entity; ++ damageSource.customEventDamager = entity; ++ // Paper end - fix DamageSource API + return damageSource; + } + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index be2220457e941803b14d78c550d0db777c79a886..f5a86c0fb1a7a313afc4c56ffc445a7fe7821428 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -3462,7 +3462,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S + return; + } + +- if (!this.hurt(this.damageSources().lightningBolt().customCausingEntity(lightning), 5.0F)) { ++ if (!this.hurt(this.damageSources().lightningBolt().customEventDamager(lightning), 5.0F)) { // Paper - fix DamageSource API + return; + } + // CraftBukkit end +diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java +index dbdb6c432448b151fa4421f14235f8bad23dc720..2eb099957a3d0bae3339ff4edbab103fb348abed 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java ++++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java +@@ -336,7 +336,7 @@ public class Turtle extends Animal { + + @Override + public void thunderHit(ServerLevel world, LightningBolt lightning) { +- this.hurt(this.damageSources().lightningBolt().customCausingEntity(lightning), Float.MAX_VALUE); // CraftBukkit ++ this.hurt(this.damageSources().lightningBolt().customEventDamager(lightning), Float.MAX_VALUE); // CraftBukkit // Paper - fix DamageSource API + } + + @Override +diff --git a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java +index 4dea85a8ab8ae16d02e35d226fd155891ce2319a..eaad15a4d201356c34c1a09c7fbe5c35f76a2176 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/HangingEntity.java +@@ -204,7 +204,7 @@ public abstract class HangingEntity extends Entity { + } else { + if (!this.isRemoved() && !this.level().isClientSide) { + // CraftBukkit start - fire break events +- Entity damager = (source.isIndirect()) ? source.getEntity() : source.getDirectEntity(); ++ Entity damager = (source.isIndirect() && source.getEntity() != null) ? source.getEntity() : source.getDirectEntity(); // Paper - fix DamageSource API + HangingBreakEvent event; + if (damager != null) { + event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damager.getBukkitEntity(), source.is(DamageTypeTags.IS_EXPLOSION) ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY); +diff --git a/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java b/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java +index a729460e35bbef134bdf0d72d8894c3df007f7b8..e6f549f1fcd261f96f0e4fc4cbe26a04c389d191 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/EvokerFangs.java +@@ -132,7 +132,7 @@ public class EvokerFangs extends Entity implements TraceableEntity { + + if (target.isAlive() && !target.isInvulnerable() && target != entityliving1) { + if (entityliving1 == null) { +- target.hurt(this.damageSources().magic().customCausingEntity(this), 6.0F); // CraftBukkit ++ target.hurt(this.damageSources().magic().customEventDamager(this), 6.0F); // CraftBukkit // Paper - fix DamageSource API + } else { + if (entityliving1.isAlliedTo((Entity) target)) { + return; +diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java +index 28690877c443ceb2bdf20e6d251c9d32f667814c..1fb1e729d6879568d8b4943071fa940325b2e5b0 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java +@@ -86,7 +86,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile { + + entityplayer.connection.teleport(teleEvent.getTo()); + entity.resetFallDistance(); +- entity.hurt(this.damageSources().fall().customCausingEntity(this), 5.0F); // CraftBukkit ++ entity.hurt(this.damageSources().fall().customEventDamager(this), 5.0F); // CraftBukkit // Paper - fix DamageSource API + } + // CraftBukkit end + this.level().playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_TELEPORT, SoundSource.PLAYERS); +diff --git a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java +index 5c7a6fe97b1f0b55b4a5dddbb684e4424688f866..6f49b9b8707d74330adb973e0db3cd5bccf138b6 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/WitherSkull.java +@@ -72,7 +72,7 @@ public class WitherSkull extends AbstractHurtingProjectile { + } + } + } else { +- flag = entity.hurt(this.damageSources().magic().customCausingEntity(this), 5.0F); // Paper - Fire EntityDamageByEntityEvent for unowned wither skulls ++ flag = entity.hurt(this.damageSources().magic().customEventDamager(this), 5.0F); // Paper - Fire EntityDamageByEntityEvent for unowned wither skulls // Paper - fix DamageSource API + } + + if (flag && entity instanceof LivingEntity) { +diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java +index b678da2cbb93cea7971bc3c4d324cfca18b0bc97..90a82bd7977ebe520bdcc2ab99e11452d5cf4a21 100644 +--- a/src/main/java/net/minecraft/world/level/Explosion.java ++++ b/src/main/java/net/minecraft/world/level/Explosion.java +@@ -103,7 +103,7 @@ public class Explosion { + this.z = z; + this.fire = createFire; + this.blockInteraction = destructionType; +- this.damageSource = damageSource == null ? world.damageSources().explosion(this).customCausingEntity(entity) : damageSource.customCausingEntity(entity); // CraftBukkit - handle source entity ++ this.damageSource = damageSource == null ? world.damageSources().explosion(this) : damageSource; // CraftBukkit - handle source entity // Paper - revert to fix DamageSource API + this.damageCalculator = behavior == null ? this.makeDamageCalculator(entity) : behavior; + this.smallExplosionParticles = particle; + this.largeExplosionParticles = emitterParticle; +diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java +index 6ae1ad21807c039726021f8f26f92042acce2fda..b7e2327c50195e8d3ca3ca3b47c7c0f9ea8e289c 100644 +--- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java ++++ b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java +@@ -41,7 +41,7 @@ public class CraftDamageSource implements DamageSource { + + @Override + public org.bukkit.entity.Entity getCausingEntity() { +- net.minecraft.world.entity.Entity entity = this.getHandle().getCausingEntity(); ++ net.minecraft.world.entity.Entity entity = this.getHandle().getEntity(); // Paper - fix DamageSource API + return (entity != null) ? entity.getBukkitEntity() : null; + } + +@@ -65,7 +65,7 @@ public class CraftDamageSource implements DamageSource { + + @Override + public boolean isIndirect() { +- return this.getHandle().getCausingEntity() != this.getHandle().getDirectEntity(); ++ return this.getHandle().isIndirect(); // Paper - fix DamageSource API + } + + @Override +diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSourceBuilder.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSourceBuilder.java +index 4c6e15535fa40aad8cf1920f392589404f9ba79c..35eb95ef6fb6a0f7ea63351e90741c489fdd15f9 100644 +--- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSourceBuilder.java ++++ b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSourceBuilder.java +@@ -41,6 +41,11 @@ public class CraftDamageSourceBuilder implements DamageSource.Builder { + + @Override + public DamageSource build() { ++ // Paper start - fix DamageCause API ++ if (this.causingEntity != null && this.directEntity == null) { ++ throw new IllegalArgumentException("Direct entity must be set if causing entity is set"); ++ } ++ // Paper end - fix DamageCause API + return CraftDamageSource.buildFromBukkit(this.damageType, this.causingEntity, this.directEntity, this.damageLocation); + } + } +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 4c2e8129481384a143384d327e14320023735b1a..cb3e9672f375a1a660757a05362729ddb5ca7504 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -1082,7 +1082,7 @@ public class CraftEventFactory { + + private static EntityDamageEvent handleEntityDamageEvent(Entity entity, DamageSource source, Map modifiers, Map> modifierFunctions, boolean cancelled) { + CraftDamageSource bukkitDamageSource = new CraftDamageSource(source); +- Entity damager = source.getCausingEntity(); ++ final Entity damager = source.getCustomEventDamager(); // Paper - fix DamageSource API + if (source.is(DamageTypeTags.IS_EXPLOSION)) { + if (damager == null) { + return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), entity, DamageCause.BLOCK_EXPLOSION, bukkitDamageSource, modifiers, modifierFunctions, cancelled, source.explodedBlockState); // Paper - Include BlockState for damage +@@ -1092,9 +1092,7 @@ public class CraftEventFactory { + } else if (damager != null || source.getDirectEntity() != null) { + DamageCause cause = (source.isSweep()) ? DamageCause.ENTITY_SWEEP_ATTACK : DamageCause.ENTITY_ATTACK; + +- if (bukkitDamageSource.isIndirect() && source.getDirectEntity() != null) { +- damager = source.getDirectEntity(); +- } ++ // Paper - fix DamageSource API + + if (damager instanceof net.minecraft.world.entity.projectile.Projectile) { + if (damager.getBukkitEntity() instanceof ThrownPotion) { From 99a641690abd3d3669249ce10243e0739a13af33 Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Sat, 16 Mar 2024 20:28:50 +0100 Subject: [PATCH 05/16] Expand Hopper BlockState API (#10328) --- patches/api/0467-Expanded-Hopper-API.patch | 32 +++++++++++++++++++ patches/server/1056-Expanded-Hopper-API.patch | 31 ++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 patches/api/0467-Expanded-Hopper-API.patch create mode 100644 patches/server/1056-Expanded-Hopper-API.patch diff --git a/patches/api/0467-Expanded-Hopper-API.patch b/patches/api/0467-Expanded-Hopper-API.patch new file mode 100644 index 000000000000..51cb6dfee2a9 --- /dev/null +++ b/patches/api/0467-Expanded-Hopper-API.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: vicisacat +Date: Fri, 15 Mar 2024 17:35:18 +0100 +Subject: [PATCH] Expanded Hopper API + + +diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java +index 7ade312f180b7e30871d3a3240c76325cc369c26..61ea33c1f2dbb546a66f945a01feae437b1381e0 100644 +--- a/src/main/java/org/bukkit/block/Hopper.java ++++ b/src/main/java/org/bukkit/block/Hopper.java +@@ -6,4 +6,20 @@ import org.bukkit.loot.Lootable; + /** + * Represents a captured state of a hopper. + */ +-public interface Hopper extends Container, LootableBlockInventory { } // Paper ++public interface Hopper extends Container, LootableBlockInventory { // Paper ++ // Paper start - Expanded Hopper API ++ /** ++ * Sets the cooldown before the hopper transfers or sucks in another item ++ * @param cooldown the cooldown in ticks ++ * @throws IllegalArgumentException if the passed cooldown value is negative. ++ */ ++ void setTransferCooldown(@org.jetbrains.annotations.Range(from = 0, to = Integer.MAX_VALUE) int cooldown); ++ ++ /** ++ * Returns the cooldown before the hopper transfers or sucks in another item ++ * @return the cooldown in ticks ++ */ ++ int getTransferCooldown(); ++ // Paper end - Expanded Hopper API ++} ++ diff --git a/patches/server/1056-Expanded-Hopper-API.patch b/patches/server/1056-Expanded-Hopper-API.patch new file mode 100644 index 000000000000..67efc0d7a269 --- /dev/null +++ b/patches/server/1056-Expanded-Hopper-API.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: vicisacat +Date: Fri, 15 Mar 2024 17:35:40 +0100 +Subject: [PATCH] Expanded Hopper API + +== AT == +public net.minecraft.world.level.block.entity.HopperBlockEntity setCooldown(I)V +public net.minecraft.world.level.block.entity.HopperBlockEntity cooldownTime + +diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java +index d446f18df647484e2f05ab642b73e914b06fdfed..af5f27fb5ebad1e05da2b7d1a0710a2ef9c6ebbe 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java +@@ -34,4 +34,17 @@ public class CraftHopper extends CraftLootable implements Hop + public CraftHopper copy() { + return new CraftHopper(this); + } ++ ++ // Paper start - Expanded Hopper API ++ @Override ++ public void setTransferCooldown(final int cooldown) { ++ com.google.common.base.Preconditions.checkArgument(cooldown >= 0, "Hooper transfer cooldown cannot be negative (" + cooldown + ")"); ++ getSnapshot().setCooldown(cooldown); ++ } ++ ++ @Override ++ public int getTransferCooldown() { ++ return getSnapshot().cooldownTime; ++ } ++ // Paper end - Expanded Hopper API + } From 09d6dfb0dfb1ea6dfdf247caa8e5b3c377711bcc Mon Sep 17 00:00:00 2001 From: Kichura <68134602+Kichura@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:30:03 +0100 Subject: [PATCH 06/16] [ci skip] Upstream dependencies in workflow scripts. (#10338) --- .github/workflows/build.yml | 6 +++--- .github/workflows/pr_comment.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af890ab3254a..e32e3a43350f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,12 +32,12 @@ jobs: distribution: 'temurin' - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Configure Build - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: determine with: script: | diff --git a/.github/workflows/pr_comment.yml b/.github/workflows/pr_comment.yml index 2e3c6d5a55cc..15c059b7904b 100644 --- a/.github/workflows/pr_comment.yml +++ b/.github/workflows/pr_comment.yml @@ -17,7 +17,7 @@ jobs: if: github.event.workflow_run.conclusion == 'success' runs-on: ubuntu-latest steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: # This snippet is public-domain, taken from # https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml From 55ffcb1111acb558d470790485d8835768873ba8 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 19 Mar 2024 19:49:12 +0100 Subject: [PATCH 07/16] Fix tripwire disarming not working as intended --- ...re-disarming-not-working-as-intended.patch | 22 +++++ ...021-Fix-tripwire-state-inconsistency.patch | 87 ------------------- 2 files changed, 22 insertions(+), 87 deletions(-) create mode 100644 patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch delete mode 100644 patches/server/1021-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch new file mode 100644 index 000000000000..efe071cf6811 --- /dev/null +++ b/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: DungeonDev +Date: Sun, 2 Jul 2023 02:34:54 +0100 +Subject: [PATCH] Fix tripwire disarming not working as intended + +Fixes MC-129055 + +diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +index d9b3877257b31ca1b5acc4a47fbf5b993de69ae0..8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61 100644 +--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +@@ -201,9 +201,8 @@ public class TripWireHookBlock extends Block { + BlockState iblockdata4 = aiblockdata[l]; + + if (iblockdata4 != null) { ++ if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended + world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3); +- if (!world.getBlockState(blockposition2).isAir()) { +- ; + } + } + } diff --git a/patches/server/1021-Fix-tripwire-state-inconsistency.patch b/patches/server/1021-Fix-tripwire-state-inconsistency.patch deleted file mode 100644 index bce767ae73b5..000000000000 --- a/patches/server/1021-Fix-tripwire-state-inconsistency.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Sun, 19 Dec 2021 21:11:20 +0100 -Subject: [PATCH] Fix tripwire state inconsistency - -This patch prevents updating and re-setting the tripwire when being removed in certain conditions - -diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -index bdb99b799d1a97f1340c3d388d2901f7cb1c3527..3cb1db27dba902678a5848a1fb5e2c6ec6241e60 100644 ---- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java -@@ -91,7 +91,7 @@ public class TripWireBlock extends Block { - public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) { - if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating - if (!moved && !state.is(newState.getBlock())) { -- this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true)); -+ this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix tripwire state inconsistency - } - } - -@@ -108,6 +108,12 @@ public class TripWireBlock extends Block { - - private void updateSource(Level world, BlockPos pos, BlockState state) { - if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating -+ // Paper start - fix tripwire state inconsistency -+ this.updateSource(world, pos, state, false); -+ } -+ -+ private void updateSource(Level world, BlockPos pos, BlockState state, boolean beingRemoved) { -+ // Paper end - fix tripwire state inconsistency - Direction[] aenumdirection = new Direction[]{Direction.SOUTH, Direction.WEST}; - int i = aenumdirection.length; - int j = 0; -@@ -123,7 +129,7 @@ public class TripWireBlock extends Block { - - if (iblockdata1.is(this.hook)) { - if (iblockdata1.getValue(TripWireHookBlock.FACING) == enumdirection.getOpposite()) { -- TripWireHookBlock.calculateState(world, blockposition1, iblockdata1, false, true, k, state); -+ TripWireHookBlock.calculateState(world, blockposition1, iblockdata1, false, true, k, state, beingRemoved); // Paper - fix tripwire state inconsistency - } - } else if (iblockdata1.is((Block) this)) { - ++k; -diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -index d9b3877257b31ca1b5acc4a47fbf5b993de69ae0..7f2dcf6a9e69779e6f898284b58fb1e32902000c 100644 ---- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -@@ -118,7 +118,13 @@ public class TripWireHookBlock extends Block { - TripWireHookBlock.calculateState(world, pos, state, false, false, -1, (BlockState) null); - } - -- public static void calculateState(Level world, BlockPos pos, BlockState state, boolean flag, boolean flag1, int i, @Nullable BlockState iblockdata1) { -+ public static void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1) { -+ // Paper start - fix tripwire state inconsistency -+ calculateState(world, pos, state, beingRemoved, flag1, i, iblockdata1, false); -+ } -+ -+ public static void calculateState(Level world, BlockPos pos, BlockState state, boolean beingRemoved, boolean flag1, int i, @Nullable BlockState iblockdata1, boolean tripWireBeingRemoved) { -+ // Paper end - fix tripwire state inconsistency - Optional optional = state.getOptionalValue(TripWireHookBlock.FACING); - - if (optional.isPresent()) { -@@ -126,7 +132,7 @@ public class TripWireHookBlock extends Block { - boolean flag2 = (Boolean) state.getOptionalValue(TripWireHookBlock.ATTACHED).orElse(false); - boolean flag3 = (Boolean) state.getOptionalValue(TripWireHookBlock.POWERED).orElse(false); - Block block = state.getBlock(); -- boolean flag4 = !flag; -+ boolean flag4 = !beingRemoved; // Paper - fix tripwire state inconsistency - boolean flag5 = false; - int j = 0; - BlockState[] aiblockdata = new BlockState[42]; -@@ -156,6 +162,7 @@ public class TripWireHookBlock extends Block { - boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED); - - flag5 |= flag6 && flag7; -+ if (k != i || !tripWireBeingRemoved || !flag6) // Paper - fix tripwire state inconsistency; don't update the tripwire again if being removed and not disarmed - aiblockdata[k] = iblockdata2; - if (k == i) { - world.scheduleTick(pos, block, 10); -@@ -187,7 +194,7 @@ public class TripWireHookBlock extends Block { - // CraftBukkit end - - TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3); -- if (!flag) { -+ if (!beingRemoved) { // Paper - fix tripwire state inconsistency - if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update - world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3); - if (flag1) { From 05fe15e0fcbd4bffd507d89a0bd751ea26eaac9a Mon Sep 17 00:00:00 2001 From: maxcom1 <46265094+maxcom1@users.noreply.github.com> Date: Wed, 20 Mar 2024 20:35:10 +0100 Subject: [PATCH 08/16] Fire EntityChangeBlockEvent on beehive nectar deposit (#10306) * Add BeehiveNectarDepositEvent * Fire EntityChangeBlockEvent instead of a separate event --- ...ntityChangeBlockEvent-in-more-places.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch index 4c1d97360d17..5d703466dc30 100644 --- a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch +++ b/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch @@ -4,6 +4,7 @@ Date: Mon, 9 Aug 2021 20:45:46 -0700 Subject: [PATCH] Fire EntityChangeBlockEvent in more places Co-authored-by: ChristopheG <61288881+chrisgdt@users.noreply.github.com> +Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java index a298f511c8a7eb208a0dd63b24ec050848a31476..41a3ca4edf4fa662f2af13efd7b78b56e24aa4a7 100644 @@ -300,6 +301,25 @@ index 6cccdd1d19488275ff3fe90838cf1c31e844d517..413b307acaad5823b9e06f49fa2faf56 generatoraccess.setBlock(blockposition, iblockdata1, 3); generatoraccess.gameEvent(GameEvent.BLOCK_CHANGE, blockposition, GameEvent.Context.of(entity, iblockdata1)); +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +index 55b0e2bf98a285cdcd30e40d94192b7a1802efd8..d445ed0895293dd45c36226051f5809be8587ebe 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +@@ -264,7 +264,13 @@ public class BeehiveBlockEntity extends BlockEntity { + --j; + } + +- world.setBlockAndUpdate(blockposition, (BlockState) iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j)); ++ // Paper start - Fire EntityChangeBlockEvent in more places ++ BlockState newBlockState = iblockdata.setValue(BeehiveBlock.HONEY_LEVEL, i + j); ++ ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entitybee, blockposition, newBlockState)) { ++ world.setBlockAndUpdate(blockposition, newBlockState); ++ } ++ // Paper end - Fire EntityChangeBlockEvent in more places + } + } + } diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java index 67c9009b735429e887e706baf50a6023d572a46c..7956002e2d4d583c27e277562312d27ea6871557 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java From de620b8480372e2896633f36e04e15dd01443265 Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Wed, 20 Mar 2024 13:42:29 -0700 Subject: [PATCH 09/16] Clone mutable types in events when changes are discarded (#10333) --- patches/api/0034-EntityPathfindEvent.patch | 4 +- patches/api/0076-AsyncTabCompleteEvent.patch | 8 +- patches/api/0082-PreCreatureSpawnEvent.patch | 4 +- ...-constructor-and-getChangedBlockData.patch | 4 +- patches/api/0155-PreSpawnerSpawnEvent.patch | 4 +- patches/api/0158-Turtle-API.patch | 8 +- patches/api/0168-BlockDestroyEvent.patch | 9 +- .../api/0247-Add-StructuresLocateEvent.patch | 4 +- patches/api/0260-Add-worldborder-events.patch | 4 +- ...utables-to-prevent-unexpected-issues.patch | 151 ++++++++++++++++++ 10 files changed, 175 insertions(+), 25 deletions(-) create mode 100644 patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0034-EntityPathfindEvent.patch b/patches/api/0034-EntityPathfindEvent.patch index f4e8d04eb9a3..3586652e5c2c 100644 --- a/patches/api/0034-EntityPathfindEvent.patch +++ b/patches/api/0034-EntityPathfindEvent.patch @@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..5804497f34bac9a9b6b16c6e5decb0119467df7b +index 0000000000000000000000000000000000000000..8267e8f1f0ade29a284831069e1268ee4b29e109 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java @@ -0,0 +1,87 @@ @@ -74,7 +74,7 @@ index 0000000000000000000000000000000000000000..5804497f34bac9a9b6b16c6e5decb011 + */ + @NotNull + public Location getLoc() { -+ return this.location; ++ return this.location.clone(); + } + + @Override diff --git a/patches/api/0076-AsyncTabCompleteEvent.patch b/patches/api/0076-AsyncTabCompleteEvent.patch index d18880ff5fbe..9a7669b39b4c 100644 --- a/patches/api/0076-AsyncTabCompleteEvent.patch +++ b/patches/api/0076-AsyncTabCompleteEvent.patch @@ -15,7 +15,7 @@ Co-authored-by: Aikar diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..e0847b6f0202bd8267c537f72a5e8c8cb7c6b1db +index 0000000000000000000000000000000000000000..8965974988ad20fbe1d45885f20a3a98d2e9595f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,339 @@ @@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..e0847b6f0202bd8267c537f72a5e8c8c + */ + @Nullable + public Location getLocation() { -+ return this.location; ++ return this.location != null ? this.location.clone() : null; + } + + /** @@ -534,7 +534,7 @@ index 0000000000000000000000000000000000000000..6f560a51277ccbd46a9142cfa057d276 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index 270e6d8ad4358baa256cee5f16cff281f063ce3b..4a3451af454295ac3e1b688e6665cad9fc594c82 100644 +index 270e6d8ad4358baa256cee5f16cff281f063ce3b..b43c3cb5c88eada186d6f81712c244aaa18fb53e 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -29,6 +29,13 @@ public class TabCompleteEvent extends Event implements Cancellable { @@ -570,7 +570,7 @@ index 270e6d8ad4358baa256cee5f16cff281f063ce3b..4a3451af454295ac3e1b688e6665cad9 + */ + @org.jetbrains.annotations.Nullable + public org.bukkit.Location getLocation() { -+ return loc; ++ return this.loc != null ? this.loc.clone() : null; + } + // Paper end + diff --git a/patches/api/0082-PreCreatureSpawnEvent.patch b/patches/api/0082-PreCreatureSpawnEvent.patch index 156b50a9c174..60f65dc98de4 100644 --- a/patches/api/0082-PreCreatureSpawnEvent.patch +++ b/patches/api/0082-PreCreatureSpawnEvent.patch @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..1d582118f19a41b499ee73b5e27ddb66ed34f06b +index 0000000000000000000000000000000000000000..633ef4dcc701916f2dbfefbbebd5994f93ffc2a4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,109 @@ @@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..1d582118f19a41b499ee73b5e27ddb66 + */ + @NotNull + public Location getSpawnLocation() { -+ return this.location; ++ return this.location.clone(); + } + + /** diff --git a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch b/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch index 9f9e760855a8..f12e6ac1f5c4 100644 --- a/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch +++ b/patches/api/0142-Add-source-block-constructor-and-getChangedBlockData.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add source block constructor and getChangedBlockData() to diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index e3a5f5824ed882058f5bac5003f66ce79733a868..1d496e5a3d1541bf0a257a4358b3943fd6415204 100644 +index e3a5f5824ed882058f5bac5003f66ce79733a868..b23686d2e452dc0b8bde453b4a375f424cb7504a 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { @@ -46,7 +46,7 @@ index e3a5f5824ed882058f5bac5003f66ce79733a868..1d496e5a3d1541bf0a257a4358b3943f + */ + @NotNull + public BlockData getChangedBlockData() { -+ return changed; ++ return changed.clone(); + } + // Paper end + diff --git a/patches/api/0155-PreSpawnerSpawnEvent.patch b/patches/api/0155-PreSpawnerSpawnEvent.patch index 8ef2cd0db237..4b6bbe6f7a7f 100644 --- a/patches/api/0155-PreSpawnerSpawnEvent.patch +++ b/patches/api/0155-PreSpawnerSpawnEvent.patch @@ -12,7 +12,7 @@ Dropped as it does not apply due to the earlier PreCreatureSpawnEvent patch not diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..9a450a0095ed0aa9c92655c2f4e5732bccdd59c9 +index 0000000000000000000000000000000000000000..2910f0bf929d918c86510f29d9361bbc19411256 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java @@ -0,0 +1,29 @@ @@ -42,6 +42,6 @@ index 0000000000000000000000000000000000000000..9a450a0095ed0aa9c92655c2f4e5732b + + @NotNull + public Location getSpawnerLocation() { -+ return this.spawnerLocation; ++ return this.spawnerLocation.clone(); + } +} diff --git a/patches/api/0158-Turtle-API.patch b/patches/api/0158-Turtle-API.patch index 4d3712fd8c56..3ec867d360d6 100644 --- a/patches/api/0158-Turtle-API.patch +++ b/patches/api/0158-Turtle-API.patch @@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..cfbc8aaf862ac90e794ee38bf8a6cb9e +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..e917e64e8ea266a3fc7387c42aad95927f0f0501 +index 0000000000000000000000000000000000000000..3029e406cd684efb5645e38711dff9c0bb7b01e4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,92 @@ @@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..e917e64e8ea266a3fc7387c42aad9592 + */ + @NotNull + public Location getLocation() { -+ return this.location; ++ return this.location.clone(); + } + + /** @@ -163,7 +163,7 @@ index 0000000000000000000000000000000000000000..e917e64e8ea266a3fc7387c42aad9592 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..5cdc6b0c3db43279e2bb8043922b31f750ddb3f5 +index 0000000000000000000000000000000000000000..7a2fa4a11b47e4982d1644830d7e28f12b4378ec --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,66 @@ @@ -210,7 +210,7 @@ index 0000000000000000000000000000000000000000..5cdc6b0c3db43279e2bb8043922b31f7 + */ + @NotNull + public Location getLocation() { -+ return this.location; ++ return this.location.clone(); + } + + @Override diff --git a/patches/api/0168-BlockDestroyEvent.patch b/patches/api/0168-BlockDestroyEvent.patch index 02357463342c..d6ac7bfb8da7 100644 --- a/patches/api/0168-BlockDestroyEvent.patch +++ b/patches/api/0168-BlockDestroyEvent.patch @@ -12,10 +12,10 @@ This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..d0421a4cbcb672cc06b40ad41fc06a67f6d2dbbb +index 0000000000000000000000000000000000000000..c0742b58ca2c098c27394915b624889ece1a9168 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java -@@ -0,0 +1,123 @@ +@@ -0,0 +1,122 @@ +package com.destroystokyo.paper.event.block; + +import org.bukkit.block.Block; @@ -79,9 +79,8 @@ index 0000000000000000000000000000000000000000..d0421a4cbcb672cc06b40ad41fc06a67 + /** + * @return The new state of this block (Air, or a Fluid type) + */ -+ @NotNull -+ public BlockData getNewState() { -+ return this.newState; ++ public @NotNull BlockData getNewState() { ++ return this.newState.clone(); + } + + /** diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0247-Add-StructuresLocateEvent.patch index ae3aef510212..746b674c5d13 100644 --- a/patches/api/0247-Add-StructuresLocateEvent.patch +++ b/patches/api/0247-Add-StructuresLocateEvent.patch @@ -176,7 +176,7 @@ index 0000000000000000000000000000000000000000..1ac3369455972aeb1ade5dc023d1f818 +} diff --git a/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..be86894561ff808d911e123b09bda72c9ed09185 +index 0000000000000000000000000000000000000000..582af444b058708638683e7d6f9b79685c04c061 --- /dev/null +++ b/src/main/java/io/papermc/paper/event/world/StructuresLocateEvent.java @@ -0,0 +1,213 @@ @@ -241,7 +241,7 @@ index 0000000000000000000000000000000000000000..be86894561ff808d911e123b09bda72c + * @return {@link Location} where search begins + */ + public @NotNull Location getOrigin() { -+ return this.origin; ++ return this.origin.clone(); + } + + /** diff --git a/patches/api/0260-Add-worldborder-events.patch b/patches/api/0260-Add-worldborder-events.patch index 1c889b6cdd5d..9f3ae7043587 100644 --- a/patches/api/0260-Add-worldborder-events.patch +++ b/patches/api/0260-Add-worldborder-events.patch @@ -202,7 +202,7 @@ index 0000000000000000000000000000000000000000..a44964593b7f78c5086dc4928e75ad89 +} diff --git a/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java b/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..a90f67e902c6ae35b2399e6f72a3ff8a5c15d05a +index 0000000000000000000000000000000000000000..dd96dcc0dd68d71bf27c758ed496153d434fb386 --- /dev/null +++ b/src/main/java/io/papermc/paper/event/world/border/WorldBorderCenterChangeEvent.java @@ -0,0 +1,79 @@ @@ -242,7 +242,7 @@ index 0000000000000000000000000000000000000000..a90f67e902c6ae35b2399e6f72a3ff8a + */ + @NotNull + public Location getOldCenter() { -+ return this.oldCenter; ++ return this.oldCenter.clone(); + } + + /** diff --git a/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch new file mode 100644 index 000000000000..e84ea7d3aa65 --- /dev/null +++ b/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch @@ -0,0 +1,151 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Sat, 16 Mar 2024 11:10:48 -0700 +Subject: [PATCH] Clone mutables to prevent unexpected issues + +There are lots of locations in the API where mutable +types are not cloned, either on return or when passed +as a parameter and assigned to a field, which can cause +unexpected behaviors. Let this be a lesson to use +immutable types for simple things Location, Vector, and +others. + +diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java +index 08d09c2a92d8aa6adf6610cc05905d58a76fce1f..c74ac0cb004aa219ce2f761969a4bb46cb7c9160 100644 +--- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java ++++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java +@@ -102,7 +102,7 @@ public class BlockCanBuildEvent extends BlockEvent { + */ + @NotNull + public BlockData getBlockData() { +- return blockData; ++ return blockData.clone(); // Paper - clone because mutation isn't used + } + + /** +diff --git a/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java b/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java +index 1a9575ad4c81aefa5ef0b927f6ac8f7064b55c49..24e1a49e48dd8f9eb2515b2ffe472a0c4d2bc09b 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityChangeBlockEvent.java +@@ -61,7 +61,7 @@ public class EntityChangeBlockEvent extends EntityEvent implements Cancellable { + */ + @NotNull + public BlockData getBlockData() { +- return to; ++ return to.clone(); // Paper - clone because mutation isn't used + } + + @NotNull +diff --git a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java +index 099efafa14c10910e4ed04abb1823f0c1a96b6a6..8506fa03293c575c35b55b052224807470fdbd98 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityExplodeEvent.java +@@ -59,7 +59,7 @@ public class EntityExplodeEvent extends EntityEvent implements Cancellable { + */ + @NotNull + public Location getLocation() { +- return location; ++ return location.clone(); // Paper - clone to avoid changes + } + + /** +diff --git a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java +index 6818e9f0ba32ca1a1e612703f7526b29f5a6438f..e4e3d2e22c28ef251d76c48ade267b4eb3749e7d 100644 +--- a/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java ++++ b/src/main/java/org/bukkit/event/entity/EntityPortalEnterEvent.java +@@ -24,7 +24,7 @@ public class EntityPortalEnterEvent extends EntityEvent { + */ + @NotNull + public Location getLocation() { +- return location; ++ return location.clone(); // Paper - clone to avoid changes + } + + @NotNull +diff --git a/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java b/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java +index 6fc66197eb2c5d59c70d8d028b7963748371edbe..2bb29fa449cd6c90b52d2786ed15b6154d591607 100644 +--- a/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java ++++ b/src/main/java/org/bukkit/event/entity/ItemDespawnEvent.java +@@ -46,7 +46,7 @@ public class ItemDespawnEvent extends EntityEvent implements Cancellable { + */ + @NotNull + public Location getLocation() { +- return location; ++ return location.clone(); // Paper - clone to avoid changes + } + + @NotNull +diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java +index d0a437bd8aeec18f800893f51ece06deb0c8972c..50fad23cf4d9f591b12a9eaebeb4e26f18e8528d 100644 +--- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java ++++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java +@@ -31,7 +31,7 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent { + */ + @NotNull + public org.bukkit.util.Vector getVelocity() { +- return velocity; ++ return velocity.clone(); + } + // Paper end + +diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java +index 7bfb84d3948c773e943374316ea25a19288ec7d0..fc4cf7b21b24fe38617fa150f697bc29da76754e 100644 +--- a/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java ++++ b/src/main/java/org/bukkit/event/vehicle/VehicleMoveEvent.java +@@ -27,7 +27,7 @@ public class VehicleMoveEvent extends VehicleEvent { + */ + @NotNull + public Location getFrom() { +- return from; ++ return from.clone(); // Paper - clone to avoid changes + } + + /** +@@ -37,7 +37,7 @@ public class VehicleMoveEvent extends VehicleEvent { + */ + @NotNull + public Location getTo() { +- return to; ++ return to.clone(); // Paper - clone to avoid changes + } + + +diff --git a/src/main/java/org/bukkit/event/world/GenericGameEvent.java b/src/main/java/org/bukkit/event/world/GenericGameEvent.java +index 2a2a329877d8da45c2d6afecf78ce88d52635cad..fb975fefc74d8c9746cab4c02860f55654cf92f7 100644 +--- a/src/main/java/org/bukkit/event/world/GenericGameEvent.java ++++ b/src/main/java/org/bukkit/event/world/GenericGameEvent.java +@@ -49,7 +49,7 @@ public class GenericGameEvent extends WorldEvent implements Cancellable { + */ + @NotNull + public Location getLocation() { +- return location; ++ return location.clone(); // Paper - clone to avoid changes + } + + /** +diff --git a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java +index 9ce93d00935446589cb2bb970cb540d109616e85..73997ae04ff39ac3984c59de32aaced9eb72ce16 100644 +--- a/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java ++++ b/src/main/java/org/bukkit/event/world/SpawnChangeEvent.java +@@ -25,7 +25,7 @@ public class SpawnChangeEvent extends WorldEvent { + */ + @NotNull + public Location getPreviousLocation() { +- return previousLocation; ++ return previousLocation.clone(); // Paper - clone to avoid changes + } + + @NotNull +diff --git a/src/main/java/org/bukkit/event/world/StructureGrowEvent.java b/src/main/java/org/bukkit/event/world/StructureGrowEvent.java +index 7af8d6e51c824cf0592b722b834f1d4986e3cc08..783e74bc382f0f6d24203fde7b811f588a674731 100644 +--- a/src/main/java/org/bukkit/event/world/StructureGrowEvent.java ++++ b/src/main/java/org/bukkit/event/world/StructureGrowEvent.java +@@ -39,7 +39,7 @@ public class StructureGrowEvent extends WorldEvent implements Cancellable { + */ + @NotNull + public Location getLocation() { +- return location; ++ return location.clone(); // Paper - clone to avoid changes + } + + /** From 41ffa0cf8c26f6137a0d21d45067fee6d5896edf Mon Sep 17 00:00:00 2001 From: TonytheMacaroni Date: Wed, 20 Mar 2024 17:33:34 -0400 Subject: [PATCH 10/16] Expose power on fireballs (#10302) --- patches/api/0072-Add-PlayerJumpEvent.patch | 4 +- patches/api/0298-Missing-Entity-API.patch | 38 +++++++++++++++++++ patches/server/0586-Missing-Entity-API.patch | 26 +++++++++++++ ...48-Fix-UnsafeValues-loadAdvancement.patch} | 0 ...-method-of-Fireballs-change-the-trav.patch | 30 --------------- ...> 0949-Add-player-idle-duration-API.patch} | 0 ...-if-we-can-see-non-visible-entities.patch} | 0 ...NPE-in-SculkBloomEvent-world-access.patch} | 0 ...tack-for-Player-sendEquipmentChange.patch} | 0 ...Ints.patch => 0953-Optimize-VarInts.patch} | 0 ...e-collision-shape-of-a-block-before.patch} | 0 ...redicate-for-blocks-when-raytracing.patch} | 0 ...em-packets-with-collector-as-source.patch} | 0 ... => 0957-Expand-LingeringPotion-API.patch} | 0 ....patch => 0958-Add-MaterialTagsTest.patch} | 0 ...ngEffect-powers-lightning-rods-and-.patch} | 0 ...h-event-for-all-player-interactions.patch} | 0 ...everal-issues-with-EntityBreedEvent.patch} | 0 ...962-Add-UUID-attribute-modifier-API.patch} | 0 ...-event-call-for-entity-teleport-API.patch} | 0 ...y-create-LootContext-for-criterions.patch} | 0 ...-t-fire-sync-events-during-worldgen.patch} | 2 +- ...tch => 0966-Add-Structure-check-API.patch} | 0 ...-getAttributeModifier-duplication-c.patch} | 0 ...store-vanilla-entity-drops-behavior.patch} | 2 +- ...-Dont-resend-blocks-on-interactions.patch} | 0 ...tch => 0970-add-more-scoreboard-API.patch} | 0 ...stry.patch => 0971-Improve-Registry.patch} | 0 ...on-null-loc-for-EntityTeleportEvent.patch} | 0 ...h => 0973-Add-experience-points-API.patch} | 0 ...h => 0974-Add-drops-to-shear-events.patch} | 0 ...> 0975-Add-PlayerShieldDisableEvent.patch} | 0 ...ate-ResourceLocation-in-NBT-reading.patch} | 0 ...-experience-dropping-on-block-break.patch} | 0 ...> 0978-Fixup-NamespacedKey-handling.patch} | 0 ...79-Expose-LootTable-of-DecoratedPot.patch} | 0 ...location-of-Vec3D-by-entity-tracker.patch} | 0 ...> 0981-Rewrite-dataconverter-system.patch} | 0 ...3-Starlight.patch => 0982-Starlight.patch} | 0 ....patch => 0983-Rewrite-chunk-system.patch} | 2 +- ...incremental-chunk-and-player-saving.patch} | 0 ...dBounds-and-getBlockState-for-inlin.patch} | 0 ...tem-frames-performance-and-bug-fixe.patch} | 0 ...ing-for-EntityLiving-hasLineOfSight.patch} | 0 ...Manager-and-add-advanced-packet-sup.patch} | 0 ...89-Allow-Saving-of-Oversized-Chunks.patch} | 0 ...90-Fix-World-isChunkGenerated-calls.patch} | 0 ...991-Flat-bedrock-generator-settings.patch} | 0 ...=> 0992-Entity-Activation-Range-2.0.patch} | 2 +- ...0993-Optional-per-player-mob-spawns.patch} | 0 ...5-Anti-Xray.patch => 0994-Anti-Xray.patch} | 0 ...g-PreCreatureSpawnEvent-with-per-pl.patch} | 0 ...timize-Collision-to-not-load-chunks.patch} | 2 +- ...alSelector-Goal.Flag-Set-operations.patch} | 0 ...98-Entity-load-save-limit-per-chunk.patch} | 0 ...-and-optimise-world-force-upgrading.patch} | 0 ...h => 1000-Improved-Watchdog-Support.patch} | 2 +- ...> 1001-Optimize-Voxel-Shape-Merging.patch} | 0 ...ch => 1002-Write-SavedData-IO-async.patch} | 0 ...nd-End-Portal-Frames-from-being-des.patch} | 0 ...ance-map-to-optimise-entity-tracker.patch} | 2 +- ...Optimize-Bit-Operations-by-inlining.patch} | 0 ...> 1006-Remove-streams-from-hot-code.patch} | 0 ...-Eigencraft-redstone-implementation.patch} | 0 ...er-Remove-Streams-Optimized-collect.patch} | 0 ...rTradeEvent-and-PlayerPurchaseEvent.patch} | 0 ...-Improve-boat-collision-performance.patch} | 0 ...=> 1011-Optimise-general-POI-access.patch} | 0 ...ementation-for-blockstate-state-loo.patch} | 0 ...> 1013-Execute-chunk-tasks-mid-tick.patch} | 0 ... 1014-Optimise-random-block-ticking.patch} | 0 ...ulate-regionfile-header-if-it-is-co.patch} | 0 ...city-compression-and-cipher-natives.patch} | 0 ...-more-information-in-watchdog-dumps.patch} | 2 +- ...tch => 1018-Collision-optimisations.patch} | 2 +- ...n-checking-in-player-move-packet-ha.patch} | 0 ...e-disarming-not-working-as-intended.patch} | 0 ...-type-tags-suggestions-in-selectors.patch} | 0 ...ate-Current-redstone-implementation.patch} | 0 ...23-optimize-dirt-and-snow-spreading.patch} | 0 ...ch => 1024-Properly-resend-entities.patch} | 0 ...pers.patch => 1025-Optimize-Hoppers.patch} | 2 +- ...-Improve-performance-of-mass-crafts.patch} | 0 ...> 1027-Actually-optimise-explosions.patch} | 0 ... 1028-Optimise-chunk-tick-iteration.patch} | 0 ...atch => 1029-Lag-compensation-ticks.patch} | 0 ...30-Optimise-nearby-player-retrieval.patch} | 0 ... 1031-Distance-manager-tick-timings.patch} | 0 ...-Oversized-block-entities-in-chunks.patch} | 0 ...packets-for-hard-colliding-entities.patch} | 0 ...h => 1034-Add-ShulkerDuplicateEvent.patch} | 0 ...dd-api-for-spawn-egg-texture-colors.patch} | 0 ...6-Disable-memory-reserve-allocating.patch} | 0 ...=> 1037-Improve-tag-parser-handling.patch} | 0 ... => 1038-Add-Lifecycle-Event-system.patch} | 0 ...nduit-API.patch => 1039-Conduit-API.patch} | 0 ...patch => 1040-ItemStack-Tooltip-API.patch} | 0 ...ackOverflowError-for-some-dispenses.patch} | 0 ...e-changed-item-from-dispense-events.patch} | 0 ...Snapshot-includeLightData-parameter.patch} | 0 ...PI.patch => 1044-Add-FluidState-API.patch} | 0 ...patch => 1045-add-number-format-api.patch} | 0 ...eck-if-itemstack-is-stackable-first.patch} | 0 ...ByEntityEvent-for-unowned-wither-sk.patch} | 0 ...patch => 1048-improve-BanList-types.patch} | 0 ...-Configurable-max-block-fluid-ticks.patch} | 0 ...50-disable-forced-empty-world-ticks.patch} | 0 ...=> 1051-Suspicious-Effect-Entry-API.patch} | 0 ...-Per-world-ticks-per-spawn-settings.patch} | 0 ...ng-message-for-initial-server-start.patch} | 0 ....patch => 1054-Fix-DamageSource-API.patch} | 0 ...I.patch => 1055-Expanded-Hopper-API.patch} | 0 112 files changed, 76 insertions(+), 42 deletions(-) rename patches/server/{0949-Fix-UnsafeValues-loadAdvancement.patch => 0948-Fix-UnsafeValues-loadAdvancement.patch} (100%) delete mode 100644 patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename patches/server/{0950-Add-player-idle-duration-API.patch => 0949-Add-player-idle-duration-API.patch} (100%) rename patches/server/{0951-Don-t-check-if-we-can-see-non-visible-entities.patch => 0950-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%) rename patches/server/{0952-Fix-NPE-in-SculkBloomEvent-world-access.patch => 0951-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%) rename patches/server/{0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%) rename patches/server/{0954-Optimize-VarInts.patch => 0953-Optimize-VarInts.patch} (100%) rename patches/server/{0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%) rename patches/server/{0956-Add-predicate-for-blocks-when-raytracing.patch => 0955-Add-predicate-for-blocks-when-raytracing.patch} (100%) rename patches/server/{0957-Broadcast-take-item-packets-with-collector-as-source.patch => 0956-Broadcast-take-item-packets-with-collector-as-source.patch} (100%) rename patches/server/{0958-Expand-LingeringPotion-API.patch => 0957-Expand-LingeringPotion-API.patch} (100%) rename patches/server/{0959-Add-MaterialTagsTest.patch => 0958-Add-MaterialTagsTest.patch} (100%) rename patches/server/{0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%) rename patches/server/{0961-Add-hand-to-fish-event-for-all-player-interactions.patch => 0960-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%) rename patches/server/{0962-Fix-several-issues-with-EntityBreedEvent.patch => 0961-Fix-several-issues-with-EntityBreedEvent.patch} (100%) rename patches/server/{0963-Add-UUID-attribute-modifier-API.patch => 0962-Add-UUID-attribute-modifier-API.patch} (100%) rename patches/server/{0964-Fix-missing-event-call-for-entity-teleport-API.patch => 0963-Fix-missing-event-call-for-entity-teleport-API.patch} (100%) rename patches/server/{0965-Lazily-create-LootContext-for-criterions.patch => 0964-Lazily-create-LootContext-for-criterions.patch} (100%) rename patches/server/{0966-Don-t-fire-sync-events-during-worldgen.patch => 0965-Don-t-fire-sync-events-during-worldgen.patch} (99%) rename patches/server/{0967-Add-Structure-check-API.patch => 0966-Add-Structure-check-API.patch} (100%) rename patches/server/{0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%) rename patches/server/{0969-Restore-vanilla-entity-drops-behavior.patch => 0968-Restore-vanilla-entity-drops-behavior.patch} (99%) rename patches/server/{0970-Dont-resend-blocks-on-interactions.patch => 0969-Dont-resend-blocks-on-interactions.patch} (100%) rename patches/server/{0971-add-more-scoreboard-API.patch => 0970-add-more-scoreboard-API.patch} (100%) rename patches/server/{0972-Improve-Registry.patch => 0971-Improve-Registry.patch} (100%) rename patches/server/{0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%) rename patches/server/{0974-Add-experience-points-API.patch => 0973-Add-experience-points-API.patch} (100%) rename patches/server/{0975-Add-drops-to-shear-events.patch => 0974-Add-drops-to-shear-events.patch} (100%) rename patches/server/{0976-Add-PlayerShieldDisableEvent.patch => 0975-Add-PlayerShieldDisableEvent.patch} (100%) rename patches/server/{0977-Validate-ResourceLocation-in-NBT-reading.patch => 0976-Validate-ResourceLocation-in-NBT-reading.patch} (100%) rename patches/server/{0978-Properly-handle-experience-dropping-on-block-break.patch => 0977-Properly-handle-experience-dropping-on-block-break.patch} (100%) rename patches/server/{0979-Fixup-NamespacedKey-handling.patch => 0978-Fixup-NamespacedKey-handling.patch} (100%) rename patches/server/{0980-Expose-LootTable-of-DecoratedPot.patch => 0979-Expose-LootTable-of-DecoratedPot.patch} (100%) rename patches/server/{0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%) rename patches/server/{0982-Rewrite-dataconverter-system.patch => 0981-Rewrite-dataconverter-system.patch} (100%) rename patches/server/{0983-Starlight.patch => 0982-Starlight.patch} (100%) rename patches/server/{0984-Rewrite-chunk-system.patch => 0983-Rewrite-chunk-system.patch} (99%) rename patches/server/{0985-incremental-chunk-and-player-saving.patch => 0984-incremental-chunk-and-player-saving.patch} (100%) rename patches/server/{0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%) rename patches/server/{0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%) rename patches/server/{0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%) rename patches/server/{0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%) rename patches/server/{0990-Allow-Saving-of-Oversized-Chunks.patch => 0989-Allow-Saving-of-Oversized-Chunks.patch} (100%) rename patches/server/{0991-Fix-World-isChunkGenerated-calls.patch => 0990-Fix-World-isChunkGenerated-calls.patch} (100%) rename patches/server/{0992-Flat-bedrock-generator-settings.patch => 0991-Flat-bedrock-generator-settings.patch} (100%) rename patches/server/{0993-Entity-Activation-Range-2.0.patch => 0992-Entity-Activation-Range-2.0.patch} (99%) rename patches/server/{0994-Optional-per-player-mob-spawns.patch => 0993-Optional-per-player-mob-spawns.patch} (100%) rename patches/server/{0995-Anti-Xray.patch => 0994-Anti-Xray.patch} (100%) rename patches/server/{0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%) rename patches/server/{0997-Optimize-Collision-to-not-load-chunks.patch => 0996-Optimize-Collision-to-not-load-chunks.patch} (98%) rename patches/server/{0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%) rename patches/server/{0999-Entity-load-save-limit-per-chunk.patch => 0998-Entity-load-save-limit-per-chunk.patch} (100%) rename patches/server/{1000-Fix-and-optimise-world-force-upgrading.patch => 0999-Fix-and-optimise-world-force-upgrading.patch} (100%) rename patches/server/{1001-Improved-Watchdog-Support.patch => 1000-Improved-Watchdog-Support.patch} (99%) rename patches/server/{1002-Optimize-Voxel-Shape-Merging.patch => 1001-Optimize-Voxel-Shape-Merging.patch} (100%) rename patches/server/{1003-Write-SavedData-IO-async.patch => 1002-Write-SavedData-IO-async.patch} (100%) rename patches/server/{1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%) rename patches/server/{1005-Use-distance-map-to-optimise-entity-tracker.patch => 1004-Use-distance-map-to-optimise-entity-tracker.patch} (99%) rename patches/server/{1006-Optimize-Bit-Operations-by-inlining.patch => 1005-Optimize-Bit-Operations-by-inlining.patch} (100%) rename patches/server/{1007-Remove-streams-from-hot-code.patch => 1006-Remove-streams-from-hot-code.patch} (100%) rename patches/server/{1008-Eigencraft-redstone-implementation.patch => 1007-Eigencraft-redstone-implementation.patch} (100%) rename patches/server/{1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%) rename patches/server/{1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%) rename patches/server/{1011-Improve-boat-collision-performance.patch => 1010-Improve-boat-collision-performance.patch} (100%) rename patches/server/{1012-Optimise-general-POI-access.patch => 1011-Optimise-general-POI-access.patch} (100%) rename patches/server/{1013-Custom-table-implementation-for-blockstate-state-loo.patch => 1012-Custom-table-implementation-for-blockstate-state-loo.patch} (100%) rename patches/server/{1014-Execute-chunk-tasks-mid-tick.patch => 1013-Execute-chunk-tasks-mid-tick.patch} (100%) rename patches/server/{1015-Optimise-random-block-ticking.patch => 1014-Optimise-random-block-ticking.patch} (100%) rename patches/server/{1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%) rename patches/server/{1017-Use-Velocity-compression-and-cipher-natives.patch => 1016-Use-Velocity-compression-and-cipher-natives.patch} (100%) rename patches/server/{1018-Detail-more-information-in-watchdog-dumps.patch => 1017-Detail-more-information-in-watchdog-dumps.patch} (99%) rename patches/server/{1019-Collision-optimisations.patch => 1018-Collision-optimisations.patch} (99%) rename patches/server/{1020-Optimise-collision-checking-in-player-move-packet-ha.patch => 1019-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%) rename patches/server/{1021-Fix-tripwire-disarming-not-working-as-intended.patch => 1020-Fix-tripwire-disarming-not-working-as-intended.patch} (100%) rename patches/server/{1022-Fix-entity-type-tags-suggestions-in-selectors.patch => 1021-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%) rename patches/server/{1023-Add-Alternate-Current-redstone-implementation.patch => 1022-Add-Alternate-Current-redstone-implementation.patch} (100%) rename patches/server/{1024-optimize-dirt-and-snow-spreading.patch => 1023-optimize-dirt-and-snow-spreading.patch} (100%) rename patches/server/{1025-Properly-resend-entities.patch => 1024-Properly-resend-entities.patch} (100%) rename patches/server/{1026-Optimize-Hoppers.patch => 1025-Optimize-Hoppers.patch} (99%) rename patches/server/{1027-Improve-performance-of-mass-crafts.patch => 1026-Improve-performance-of-mass-crafts.patch} (100%) rename patches/server/{1028-Actually-optimise-explosions.patch => 1027-Actually-optimise-explosions.patch} (100%) rename patches/server/{1029-Optimise-chunk-tick-iteration.patch => 1028-Optimise-chunk-tick-iteration.patch} (100%) rename patches/server/{1030-Lag-compensation-ticks.patch => 1029-Lag-compensation-ticks.patch} (100%) rename patches/server/{1031-Optimise-nearby-player-retrieval.patch => 1030-Optimise-nearby-player-retrieval.patch} (100%) rename patches/server/{1032-Distance-manager-tick-timings.patch => 1031-Distance-manager-tick-timings.patch} (100%) rename patches/server/{1033-Handle-Oversized-block-entities-in-chunks.patch => 1032-Handle-Oversized-block-entities-in-chunks.patch} (100%) rename patches/server/{1034-Send-full-pos-packets-for-hard-colliding-entities.patch => 1033-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%) rename patches/server/{1035-Add-ShulkerDuplicateEvent.patch => 1034-Add-ShulkerDuplicateEvent.patch} (100%) rename patches/server/{1036-Add-api-for-spawn-egg-texture-colors.patch => 1035-Add-api-for-spawn-egg-texture-colors.patch} (100%) rename patches/server/{1037-Disable-memory-reserve-allocating.patch => 1036-Disable-memory-reserve-allocating.patch} (100%) rename patches/server/{1038-Improve-tag-parser-handling.patch => 1037-Improve-tag-parser-handling.patch} (100%) rename patches/server/{1039-Add-Lifecycle-Event-system.patch => 1038-Add-Lifecycle-Event-system.patch} (100%) rename patches/server/{1040-Conduit-API.patch => 1039-Conduit-API.patch} (100%) rename patches/server/{1041-ItemStack-Tooltip-API.patch => 1040-ItemStack-Tooltip-API.patch} (100%) rename patches/server/{1042-Fix-possible-StackOverflowError-for-some-dispenses.patch => 1041-Fix-possible-StackOverflowError-for-some-dispenses.patch} (100%) rename patches/server/{1043-Properly-track-the-changed-item-from-dispense-events.patch => 1042-Properly-track-the-changed-item-from-dispense-events.patch} (100%) rename patches/server/{1044-Add-getChunkSnapshot-includeLightData-parameter.patch => 1043-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%) rename patches/server/{1045-Add-FluidState-API.patch => 1044-Add-FluidState-API.patch} (100%) rename patches/server/{1046-add-number-format-api.patch => 1045-add-number-format-api.patch} (100%) rename patches/server/{1047-check-if-itemstack-is-stackable-first.patch => 1046-check-if-itemstack-is-stackable-first.patch} (100%) rename patches/server/{1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch => 1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch} (100%) rename patches/server/{1049-improve-BanList-types.patch => 1048-improve-BanList-types.patch} (100%) rename patches/server/{1050-Configurable-max-block-fluid-ticks.patch => 1049-Configurable-max-block-fluid-ticks.patch} (100%) rename patches/server/{1051-disable-forced-empty-world-ticks.patch => 1050-disable-forced-empty-world-ticks.patch} (100%) rename patches/server/{1052-Suspicious-Effect-Entry-API.patch => 1051-Suspicious-Effect-Entry-API.patch} (100%) rename patches/server/{1053-Per-world-ticks-per-spawn-settings.patch => 1052-Per-world-ticks-per-spawn-settings.patch} (100%) rename patches/server/{1054-Add-onboarding-message-for-initial-server-start.patch => 1053-Add-onboarding-message-for-initial-server-start.patch} (100%) rename patches/server/{1055-Fix-DamageSource-API.patch => 1054-Fix-DamageSource-API.patch} (100%) rename patches/server/{1056-Expanded-Hopper-API.patch => 1055-Expanded-Hopper-API.patch} (100%) diff --git a/patches/api/0072-Add-PlayerJumpEvent.patch b/patches/api/0072-Add-PlayerJumpEvent.patch index a65192d7a108..fef1ccd34792 100644 --- a/patches/api/0072-Add-PlayerJumpEvent.patch +++ b/patches/api/0072-Add-PlayerJumpEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..d3c319298d360967b853cf0168c0a1833f094779 +index 0000000000000000000000000000000000000000..8c2fd2c1120d634052f9bc345365272ad3a67b6f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java @@ -0,0 +1,106 @@ @@ -102,7 +102,7 @@ index 0000000000000000000000000000000000000000..d3c319298d360967b853cf0168c0a183 + */ + @NotNull + public Location getTo() { -+ return this.to; ++ return this.to.clone(); + } + + @NotNull diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0298-Missing-Entity-API.patch index 2e2d58e8f3ce..33d18a3ebef9 100644 --- a/patches/api/0298-Missing-Entity-API.patch +++ b/patches/api/0298-Missing-Entity-API.patch @@ -9,6 +9,7 @@ Co-authored-by: William Blake Galbreath Co-authored-by: SoSeDiK Co-authored-by: booky10 Co-authored-by: Amin +Co-authored-by: TrollyLoki diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java new file mode 100644 @@ -413,6 +414,43 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c + int getLifetimeTicks(); + // Paper end } +diff --git a/src/main/java/org/bukkit/entity/Fireball.java b/src/main/java/org/bukkit/entity/Fireball.java +index 7a44707f2307dc4dbfea4de3f4baf3cc0490dc93..d0e82102425e54274be9c4769634d754319d6196 100644 +--- a/src/main/java/org/bukkit/entity/Fireball.java ++++ b/src/main/java/org/bukkit/entity/Fireball.java +@@ -23,4 +23,32 @@ public interface Fireball extends Projectile, Explosive { + @NotNull + public Vector getDirection(); + ++ // Paper start - Expose power on fireball projectiles ++ /** ++ * {@inheritDoc} ++ *

++ * Note: For fireball entities, their movement is also controlled by their power. ++ * ++ * @param velocity New velocity to travel with ++ * @see #setPower(Vector) ++ */ ++ @Override ++ public void setVelocity(@NotNull Vector velocity); ++ ++ /** ++ * Sets the power of a fireball. The power determines the direction and magnitude of its acceleration. ++ * ++ * @param power the power ++ */ ++ public void setPower(@NotNull Vector power); ++ ++ /** ++ * Gets the power of a fireball. The power determines the direction and magnitude of its acceleration. ++ * ++ * @return the power ++ */ ++ @NotNull ++ public Vector getPower(); ++ // Paper end - Expose power on fireball projectiles ++ + } diff --git a/src/main/java/org/bukkit/entity/Fox.java b/src/main/java/org/bukkit/entity/Fox.java index c61a473453f33f9d10c330fc46cfa9d52251fe49..473a7e36ad64f866d1d2e09e2ecb2e9881668faf 100644 --- a/src/main/java/org/bukkit/entity/Fox.java diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0586-Missing-Entity-API.patch index 1d25ac639621..501d3329dd37 100644 --- a/patches/server/0586-Missing-Entity-API.patch +++ b/patches/server/0586-Missing-Entity-API.patch @@ -36,6 +36,7 @@ Co-authored-by: William Blake Galbreath Co-authored-by: SoSeDiK Co-authored-by: booky10 Co-authored-by: Amin +Co-authored-by: TrollyLoki diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java index 8117578ced94aa6bf01871f6526a388385c4adf2..59699c59fdfc611177fdb3136f84ab539b17d9c9 100644 @@ -666,6 +667,31 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee + } + // Paper end } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..e1a2f0924da6ebcdf332040f922226af5d8a2d45 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +@@ -59,6 +59,20 @@ public class CraftFireball extends AbstractProjectile implements Fireball { + this.update(); // SPIGOT-6579 + } + ++ // Paper start - Expose power on fireball projectiles ++ @Override ++ public void setPower(final Vector power) { ++ this.getHandle().xPower = power.getX(); ++ this.getHandle().yPower = power.getY(); ++ this.getHandle().zPower = power.getZ(); ++ } ++ ++ @Override ++ public Vector getPower() { ++ return new Vector(this.getHandle().xPower, this.getHandle().yPower, this.getHandle().zPower); ++ } ++ // Paper end - Expose power on fireball projectiles ++ + @Override + public AbstractHurtingProjectile getHandle() { + return (AbstractHurtingProjectile) this.entity; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java index 17164811bbcf983bef62c47bc99330074762267b..c455deb4fd2a7684bcc01a8212c362a2375c190b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java diff --git a/patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0949-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch deleted file mode 100644 index 3af04ed113ac..000000000000 --- a/patches/server/0948-Make-setVelocity-method-of-Fireballs-change-the-trav.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: TrollyLoki -Date: Tue, 10 Oct 2023 00:45:01 -0400 -Subject: [PATCH] Make setVelocity method of Fireballs change the travel - direction to an arbitrary vector - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java -index 2783e218d5e5c24787429237974e196761f4d02b..1d8aab2fda18c6e2bb30f6ba4a6325263267b628 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java -@@ -46,6 +46,18 @@ public class CraftFireball extends AbstractProjectile implements Fireball { - this.update(); // SPIGOT-6579 - } - -+ // Paper start - set direction without normalizing -+ @Override -+ public void setVelocity(Vector velocity) { -+ Preconditions.checkArgument(velocity != null, "Vector velocity cannot be null"); -+ velocity.checkFinite(); -+ this.getHandle().xPower = velocity.getX(); -+ this.getHandle().yPower = velocity.getY(); -+ this.getHandle().zPower = velocity.getZ(); -+ update(); -+ } -+ // Paper end - set direction without normalizing -+ - @Override - public AbstractHurtingProjectile getHandle() { - return (AbstractHurtingProjectile) this.entity; diff --git a/patches/server/0950-Add-player-idle-duration-API.patch b/patches/server/0949-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0950-Add-player-idle-duration-API.patch rename to patches/server/0949-Add-player-idle-duration-API.patch diff --git a/patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0951-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0952-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0953-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0954-Optimize-VarInts.patch b/patches/server/0953-Optimize-VarInts.patch similarity index 100% rename from patches/server/0954-Optimize-VarInts.patch rename to patches/server/0953-Optimize-VarInts.patch diff --git a/patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0955-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0956-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0957-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0958-Expand-LingeringPotion-API.patch b/patches/server/0957-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0958-Expand-LingeringPotion-API.patch rename to patches/server/0957-Expand-LingeringPotion-API.patch diff --git a/patches/server/0959-Add-MaterialTagsTest.patch b/patches/server/0958-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/0959-Add-MaterialTagsTest.patch rename to patches/server/0958-Add-MaterialTagsTest.patch diff --git a/patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0960-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0961-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0963-Add-UUID-attribute-modifier-API.patch b/patches/server/0962-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0963-Add-UUID-attribute-modifier-API.patch rename to patches/server/0962-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0964-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0965-Lazily-create-LootContext-for-criterions.patch b/patches/server/0964-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0965-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0964-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch similarity index 99% rename from patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch index 020056307757..2654c1f60d65 100644 --- a/patches/server/0966-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 8235dace0f4a1090dfbd403db34231ccafe5f30e..9816913ad729fd39c173364b92e5db06 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bbc3f09105b19eabd3ebb8b9589412b8871739a1..67dfb7b6a8825a87ff69b8c33efd1c040db12bf0 100644 +index 919c9ff3dd97d4bd2d41631176f9671f1987ad91..1de77621f159608f572ab4935ceb78863bb82c59 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -637,7 +637,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0967-Add-Structure-check-API.patch b/patches/server/0966-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0967-Add-Structure-check-API.patch rename to patches/server/0966-Add-Structure-check-API.patch diff --git a/patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0968-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch similarity index 99% rename from patches/server/0969-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0968-Restore-vanilla-entity-drops-behavior.patch index c2f0a406f777..e6db1df6807c 100644 --- a/patches/server/0969-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch @@ -50,7 +50,7 @@ index 7272dc058c575efee5ac2643ce41b7d12e346e89..ae5a2136a0e266d4c35190f5d3355299 if (entityitem == null) { return null; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 67dfb7b6a8825a87ff69b8c33efd1c040db12bf0..198aeb71e958a3fa6f8eaa8f607120af483e597f 100644 +index 1de77621f159608f572ab4935ceb78863bb82c59..5ab9ca815cb324c47c3e25a4d84a1b432bb393be 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2496,6 +2496,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0970-Dont-resend-blocks-on-interactions.patch b/patches/server/0969-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0970-Dont-resend-blocks-on-interactions.patch rename to patches/server/0969-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0971-add-more-scoreboard-API.patch b/patches/server/0970-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0971-add-more-scoreboard-API.patch rename to patches/server/0970-add-more-scoreboard-API.patch diff --git a/patches/server/0972-Improve-Registry.patch b/patches/server/0971-Improve-Registry.patch similarity index 100% rename from patches/server/0972-Improve-Registry.patch rename to patches/server/0971-Improve-Registry.patch diff --git a/patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0973-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0974-Add-experience-points-API.patch b/patches/server/0973-Add-experience-points-API.patch similarity index 100% rename from patches/server/0974-Add-experience-points-API.patch rename to patches/server/0973-Add-experience-points-API.patch diff --git a/patches/server/0975-Add-drops-to-shear-events.patch b/patches/server/0974-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0975-Add-drops-to-shear-events.patch rename to patches/server/0974-Add-drops-to-shear-events.patch diff --git a/patches/server/0976-Add-PlayerShieldDisableEvent.patch b/patches/server/0975-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0976-Add-PlayerShieldDisableEvent.patch rename to patches/server/0975-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0977-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0978-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0979-Fixup-NamespacedKey-handling.patch b/patches/server/0978-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0979-Fixup-NamespacedKey-handling.patch rename to patches/server/0978-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0980-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0980-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0979-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0981-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0982-Rewrite-dataconverter-system.patch b/patches/server/0981-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0982-Rewrite-dataconverter-system.patch rename to patches/server/0981-Rewrite-dataconverter-system.patch diff --git a/patches/server/0983-Starlight.patch b/patches/server/0982-Starlight.patch similarity index 100% rename from patches/server/0983-Starlight.patch rename to patches/server/0982-Starlight.patch diff --git a/patches/server/0984-Rewrite-chunk-system.patch b/patches/server/0983-Rewrite-chunk-system.patch similarity index 99% rename from patches/server/0984-Rewrite-chunk-system.patch rename to patches/server/0983-Rewrite-chunk-system.patch index 0d4fc72669eb..2a35933defa5 100644 --- a/patches/server/0984-Rewrite-chunk-system.patch +++ b/patches/server/0983-Rewrite-chunk-system.patch @@ -19375,7 +19375,7 @@ index 640db9f71608310a64e09f1e3e677c01e6ccd98a..f2a7cb6ebed7a4b4019a09af2a025f62 if (flag1) { ++this.converted; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 198aeb71e958a3fa6f8eaa8f607120af483e597f..89db78c05118a64d1b73ac05381e24c825d3cf76 100644 +index 5ab9ca815cb324c47c3e25a4d84a1b432bb393be..42d01cec6eba11183409c9a93d068e61f5010153 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -480,6 +480,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0985-incremental-chunk-and-player-saving.patch b/patches/server/0984-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0985-incremental-chunk-and-player-saving.patch rename to patches/server/0984-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0991-Fix-World-isChunkGenerated-calls.patch b/patches/server/0990-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0991-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0990-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0992-Flat-bedrock-generator-settings.patch b/patches/server/0991-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0992-Flat-bedrock-generator-settings.patch rename to patches/server/0991-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0993-Entity-Activation-Range-2.0.patch b/patches/server/0992-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0993-Entity-Activation-Range-2.0.patch rename to patches/server/0992-Entity-Activation-Range-2.0.patch index c709e5d6cf26..4bec5ca13e9f 100644 --- a/patches/server/0993-Entity-Activation-Range-2.0.patch +++ b/patches/server/0992-Entity-Activation-Range-2.0.patch @@ -111,7 +111,7 @@ index bd8c96e914b156284bdbb960f168e63e1f122920..abb4c32e8b35de332fa517523e8c598e } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 89db78c05118a64d1b73ac05381e24c825d3cf76..dd785d11461541e8a93544142f7a3b4e43b2173d 100644 +index 42d01cec6eba11183409c9a93d068e61f5010153..1f892783c16ab8fd863832255a2b03df381aa84e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0994-Optional-per-player-mob-spawns.patch b/patches/server/0993-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0994-Optional-per-player-mob-spawns.patch rename to patches/server/0993-Optional-per-player-mob-spawns.patch diff --git a/patches/server/0995-Anti-Xray.patch b/patches/server/0994-Anti-Xray.patch similarity index 100% rename from patches/server/0995-Anti-Xray.patch rename to patches/server/0994-Anti-Xray.patch diff --git a/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0997-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0996-Optimize-Collision-to-not-load-chunks.patch index 106d5bd3fb2c..2ad06277cb7c 100644 --- a/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index 461c27292af06a5150de8ec263d0c8527e8c5278..37245ff682837e7e8c9647f4afe30f0d // CraftBukkit end entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dd785d11461541e8a93544142f7a3b4e43b2173d..f8ce3c92597b9fb2b8743a08088f33a7bf237c5d 100644 +index 1f892783c16ab8fd863832255a2b03df381aa84e..720d08400915da9270ee4abf84bcb73f354ae2b4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -242,6 +242,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0999-Entity-load-save-limit-per-chunk.patch b/patches/server/0998-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0999-Entity-load-save-limit-per-chunk.patch rename to patches/server/0998-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1000-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/1000-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0999-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/1001-Improved-Watchdog-Support.patch b/patches/server/1000-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/1001-Improved-Watchdog-Support.patch rename to patches/server/1000-Improved-Watchdog-Support.patch index 3614cf6564d7..bd43d6abe422 100644 --- a/patches/server/1001-Improved-Watchdog-Support.patch +++ b/patches/server/1000-Improved-Watchdog-Support.patch @@ -315,7 +315,7 @@ index 2eeb0c78f2b717b59542b6b668371558ae2fcc25..6ec3fc801453fd54c25b642e6fa71c19 final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a..ce341f42b3a5e17fb6d1f7de8057e73137ae2a6e 100644 +index b131a84865d9160d1b5d411515b69e967dbda66c..8d626fadcd4743b6472a2954d2b1b2ec89669814 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -186,6 +186,36 @@ public class Main { diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1002-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1001-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1003-Write-SavedData-IO-async.patch b/patches/server/1002-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1003-Write-SavedData-IO-async.patch rename to patches/server/1002-Write-SavedData-IO-async.patch diff --git a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch index 395ef636c56d..be6acff7e69b 100644 --- a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch @@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f8ce3c92597b9fb2b8743a08088f33a7bf237c5d..3282327f1a85155d671dd63f3e5bf9b636a3e893 100644 +index 720d08400915da9270ee4abf84bcb73f354ae2b4..28ca0aae8f8c755b558a03fc9283fa1a44697e1a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1006-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1005-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1007-Remove-streams-from-hot-code.patch b/patches/server/1006-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1007-Remove-streams-from-hot-code.patch rename to patches/server/1006-Remove-streams-from-hot-code.patch diff --git a/patches/server/1008-Eigencraft-redstone-implementation.patch b/patches/server/1007-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1008-Eigencraft-redstone-implementation.patch rename to patches/server/1007-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/1010-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/1011-Improve-boat-collision-performance.patch b/patches/server/1010-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/1011-Improve-boat-collision-performance.patch rename to patches/server/1010-Improve-boat-collision-performance.patch diff --git a/patches/server/1012-Optimise-general-POI-access.patch b/patches/server/1011-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1012-Optimise-general-POI-access.patch rename to patches/server/1011-Optimise-general-POI-access.patch diff --git a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1014-Execute-chunk-tasks-mid-tick.patch b/patches/server/1013-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/1014-Execute-chunk-tasks-mid-tick.patch rename to patches/server/1013-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/1015-Optimise-random-block-ticking.patch b/patches/server/1014-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/1015-Optimise-random-block-ticking.patch rename to patches/server/1014-Optimise-random-block-ticking.patch diff --git a/patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1016-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/1017-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/1018-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1017-Detail-more-information-in-watchdog-dumps.patch index 4f06eee45b51..710f25f69b0f 100644 --- a/patches/server/1018-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch @@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3282327f1a85155d671dd63f3e5bf9b636a3e893..2f3f1418b8ec765cfab5ece88972825d7d68cae5 100644 +index 28ca0aae8f8c755b558a03fc9283fa1a44697e1a..ec01a97cac653fb1a2065289fe5b0c6824732bcb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1019-Collision-optimisations.patch b/patches/server/1018-Collision-optimisations.patch similarity index 99% rename from patches/server/1019-Collision-optimisations.patch rename to patches/server/1018-Collision-optimisations.patch index 371f2b708c40..c57de0cfdf9b 100644 --- a/patches/server/1019-Collision-optimisations.patch +++ b/patches/server/1018-Collision-optimisations.patch @@ -2214,7 +2214,7 @@ index 594cb6ce4bfa6c42212000a1ed983ea95ee2c4bf..97b0119ac71284b3a223c089bec26d87 entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2f3f1418b8ec765cfab5ece88972825d7d68cae5..51097f1d04d981db2823e8647b546658b8fd27c1 100644 +index ec01a97cac653fb1a2065289fe5b0c6824732bcb..be2220457e941803b14d78c550d0db777c79a886 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1250,9 +1250,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1020-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/server/1021-Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1022-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1023-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1023-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1022-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1024-optimize-dirt-and-snow-spreading.patch b/patches/server/1023-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1024-optimize-dirt-and-snow-spreading.patch rename to patches/server/1023-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1025-Properly-resend-entities.patch b/patches/server/1024-Properly-resend-entities.patch similarity index 100% rename from patches/server/1025-Properly-resend-entities.patch rename to patches/server/1024-Properly-resend-entities.patch diff --git a/patches/server/1026-Optimize-Hoppers.patch b/patches/server/1025-Optimize-Hoppers.patch similarity index 99% rename from patches/server/1026-Optimize-Hoppers.patch rename to patches/server/1025-Optimize-Hoppers.patch index 14afff5a290f..b9cc3698c6c3 100644 --- a/patches/server/1026-Optimize-Hoppers.patch +++ b/patches/server/1025-Optimize-Hoppers.patch @@ -105,7 +105,7 @@ index 20201430ee8f28245aa845acb172d0f5d80458ff..9ea74d37cd951e0dc76d20ed8234b587 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 4dda44608320c2a872b23053a1c3de63b79741c2..757edf74751dc7183454656fda9cecc4eb601e4c 100644 +index e3b6f2bf93710ea695b0c25c0b6968a8f24f0829..cdb739df2a285032d25d84f4464f202a7a3fa578 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -152,6 +152,43 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/1027-Improve-performance-of-mass-crafts.patch b/patches/server/1026-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1027-Improve-performance-of-mass-crafts.patch rename to patches/server/1026-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1028-Actually-optimise-explosions.patch b/patches/server/1027-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1028-Actually-optimise-explosions.patch rename to patches/server/1027-Actually-optimise-explosions.patch diff --git a/patches/server/1029-Optimise-chunk-tick-iteration.patch b/patches/server/1028-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1029-Optimise-chunk-tick-iteration.patch rename to patches/server/1028-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1030-Lag-compensation-ticks.patch b/patches/server/1029-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1030-Lag-compensation-ticks.patch rename to patches/server/1029-Lag-compensation-ticks.patch diff --git a/patches/server/1031-Optimise-nearby-player-retrieval.patch b/patches/server/1030-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1031-Optimise-nearby-player-retrieval.patch rename to patches/server/1030-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1032-Distance-manager-tick-timings.patch b/patches/server/1031-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/1032-Distance-manager-tick-timings.patch rename to patches/server/1031-Distance-manager-tick-timings.patch diff --git a/patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1033-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/1034-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/1035-Add-ShulkerDuplicateEvent.patch b/patches/server/1034-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/1035-Add-ShulkerDuplicateEvent.patch rename to patches/server/1034-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/1036-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/1037-Disable-memory-reserve-allocating.patch b/patches/server/1036-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/1037-Disable-memory-reserve-allocating.patch rename to patches/server/1036-Disable-memory-reserve-allocating.patch diff --git a/patches/server/1038-Improve-tag-parser-handling.patch b/patches/server/1037-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/1038-Improve-tag-parser-handling.patch rename to patches/server/1037-Improve-tag-parser-handling.patch diff --git a/patches/server/1039-Add-Lifecycle-Event-system.patch b/patches/server/1038-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/1039-Add-Lifecycle-Event-system.patch rename to patches/server/1038-Add-Lifecycle-Event-system.patch diff --git a/patches/server/1040-Conduit-API.patch b/patches/server/1039-Conduit-API.patch similarity index 100% rename from patches/server/1040-Conduit-API.patch rename to patches/server/1039-Conduit-API.patch diff --git a/patches/server/1041-ItemStack-Tooltip-API.patch b/patches/server/1040-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/1041-ItemStack-Tooltip-API.patch rename to patches/server/1040-ItemStack-Tooltip-API.patch diff --git a/patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/1042-Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/1043-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/1044-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/1045-Add-FluidState-API.patch b/patches/server/1044-Add-FluidState-API.patch similarity index 100% rename from patches/server/1045-Add-FluidState-API.patch rename to patches/server/1044-Add-FluidState-API.patch diff --git a/patches/server/1046-add-number-format-api.patch b/patches/server/1045-add-number-format-api.patch similarity index 100% rename from patches/server/1046-add-number-format-api.patch rename to patches/server/1045-add-number-format-api.patch diff --git a/patches/server/1047-check-if-itemstack-is-stackable-first.patch b/patches/server/1046-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/1047-check-if-itemstack-is-stackable-first.patch rename to patches/server/1046-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/1048-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/1049-improve-BanList-types.patch b/patches/server/1048-improve-BanList-types.patch similarity index 100% rename from patches/server/1049-improve-BanList-types.patch rename to patches/server/1048-improve-BanList-types.patch diff --git a/patches/server/1050-Configurable-max-block-fluid-ticks.patch b/patches/server/1049-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/1050-Configurable-max-block-fluid-ticks.patch rename to patches/server/1049-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/1051-disable-forced-empty-world-ticks.patch b/patches/server/1050-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/1051-disable-forced-empty-world-ticks.patch rename to patches/server/1050-disable-forced-empty-world-ticks.patch diff --git a/patches/server/1052-Suspicious-Effect-Entry-API.patch b/patches/server/1051-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/1052-Suspicious-Effect-Entry-API.patch rename to patches/server/1051-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/1053-Per-world-ticks-per-spawn-settings.patch b/patches/server/1052-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/1053-Per-world-ticks-per-spawn-settings.patch rename to patches/server/1052-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/1054-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/server/1054-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/1053-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/1055-Fix-DamageSource-API.patch b/patches/server/1054-Fix-DamageSource-API.patch similarity index 100% rename from patches/server/1055-Fix-DamageSource-API.patch rename to patches/server/1054-Fix-DamageSource-API.patch diff --git a/patches/server/1056-Expanded-Hopper-API.patch b/patches/server/1055-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/1056-Expanded-Hopper-API.patch rename to patches/server/1055-Expanded-Hopper-API.patch From 88419b207579533646ab011da886030ea9ea4862 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 20 Mar 2024 21:47:50 +0000 Subject: [PATCH 11/16] Do not copy profile data if profiles are the same (#10259) --- patches/server/0134-Basic-PlayerProfile-API.patch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/server/0134-Basic-PlayerProfile-API.patch b/patches/server/0134-Basic-PlayerProfile-API.patch index a41c0666bc75..2a1ca07786da 100644 --- a/patches/server/0134-Basic-PlayerProfile-API.patch +++ b/patches/server/0134-Basic-PlayerProfile-API.patch @@ -16,10 +16,10 @@ public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/ diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 0000000000000000000000000000000000000000..daa157eaa021d039f9a092bea0b78f7c1f746e3b +index 0000000000000000000000000000000000000000..68c99e29450e318d2b6eb83099e3e4012b6f0c01 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java -@@ -0,0 +1,409 @@ +@@ -0,0 +1,412 @@ +package com.destroystokyo.paper.profile; + +import com.mojang.authlib.yggdrasil.ProfileResult; @@ -236,7 +236,7 @@ index 0000000000000000000000000000000000000000..daa157eaa021d039f9a092bea0b78f7c + // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't + copyProfileProperties(this.profile, profile); + this.profile = profile; -+ } else { ++ } else if (profile != this.profile) { + copyProfileProperties(profile, this.profile); + } + } @@ -267,6 +267,9 @@ index 0000000000000000000000000000000000000000..daa157eaa021d039f9a092bea0b78f7c + } + + private static void copyProfileProperties(GameProfile source, GameProfile target, boolean clearTarget) { ++ if (source == target) { ++ throw new IllegalArgumentException("Source and target profiles are the same (" + source + ")"); ++ } + PropertyMap sourceProperties = source.getProperties(); + PropertyMap targetProperties = target.getProperties(); + if (clearTarget) targetProperties.clear(); From 9ec7dfcbc41c6e625de0050b6997160a75df9f44 Mon Sep 17 00:00:00 2001 From: FireInstall <29309865+FireInstall@users.noreply.github.com> Date: Sat, 23 Mar 2024 20:27:30 +0100 Subject: [PATCH 12/16] Move invisible setting up to entities (#10346) --- patches/api/0298-Missing-Entity-API.patch | 52 ++++++++++++++++++- ...23-Add-Raw-Byte-Entity-Serialization.patch | 4 +- .../api/0329-Entity-powdered-snow-API.patch | 4 +- patches/api/0339-Freeze-Tick-Lock-API.patch | 8 +-- patches/api/0368-Collision-API.patch | 4 +- ...-swingHand-EquipmentSlot-convenience.patch | 4 +- .../api/0381-Add-entity-knockback-API.patch | 4 +- patches/api/0388-ItemStack-damage-API.patch | 4 +- .../0395-Add-Sneaking-API-for-Entities.patch | 6 +-- .../api/0401-Add-Entity-Body-Yaw-API.patch | 8 +-- ...Folia-scheduler-and-owned-region-API.patch | 4 +- ...-API-for-an-entity-s-scoreboard-name.patch | 4 +- patches/api/0426-Expand-Pose-API.patch | 4 +- patches/server/0586-Missing-Entity-API.patch | 42 +++++++++++++-- ...27-Add-Raw-Byte-Entity-Serialization.patch | 9 ++-- .../0677-Entity-powdered-snow-API.patch | 7 +-- patches/server/0772-Collision-API.patch | 9 ++-- .../0798-Add-entity-knockback-API.patch | 4 +- .../server/0816-ItemStack-damage-API.patch | 4 +- patches/server/0817-Friction-API.patch | 4 +- .../server/0843-Add-Entity-Body-Yaw-API.patch | 10 ++-- ...-API-for-an-entity-s-scoreboard-name.patch | 4 +- 22 files changed, 144 insertions(+), 59 deletions(-) diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0298-Missing-Entity-API.patch index 33d18a3ebef9..1a3f1b5e632d 100644 --- a/patches/api/0298-Missing-Entity-API.patch +++ b/patches/api/0298-Missing-Entity-API.patch @@ -10,6 +10,7 @@ Co-authored-by: SoSeDiK Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki +Co-authored-by: FireInstall diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java new file mode 100644 @@ -414,6 +415,37 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c + int getLifetimeTicks(); + // Paper end } +diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java +index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dcd20f180f 100644 +--- a/src/main/java/org/bukkit/entity/Entity.java ++++ b/src/main/java/org/bukkit/entity/Entity.java +@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + */ + boolean isFrozen(); + ++ // Paper start - move invisibility up to Entity ++ /** ++ * Sets whether the entity is invisible or not. ++ *

++ * This setting is undefined for non-living entities like boats or paintings. ++ * Non-living entities that are marked as invisible through this method may e.g. only hide their shadow. ++ * To hide such entities from players completely, see {@link Player#hideEntity(org.bukkit.plugin.Plugin, Entity)}. ++ * ++ * @param invisible If the entity is invisible ++ */ ++ void setInvisible(boolean invisible); ++ ++ /** ++ * Gets whether the entity is invisible or not. ++ * ++ * @return Whether the entity is invisible ++ */ ++ boolean isInvisible(); ++ // Paper end - move invisibility up to Entity ++ + /** + * Mark the entity's removal. + * diff --git a/src/main/java/org/bukkit/entity/Fireball.java b/src/main/java/org/bukkit/entity/Fireball.java index 7a44707f2307dc4dbfea4de3f4baf3cc0490dc93..d0e82102425e54274be9c4769634d754319d6196 100644 --- a/src/main/java/org/bukkit/entity/Fireball.java @@ -538,10 +570,26 @@ index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565e + // Paper end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b1fb059fc2249814c9e509c219da2aed84d34fe0..6e6b80843a8669b422f93e98343e1da9f8546ee7 100644 +index b1fb059fc2249814c9e509c219da2aed84d34fe0..ff89fc699b7aaba982c59ace4effaffc5285ca17 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1016,6 +1016,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -960,6 +960,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource + * + * @param invisible If the entity is invisible + */ ++ @Override // Paper - move invisibility up to Entity + public void setInvisible(boolean invisible); + + /** +@@ -967,6 +968,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource + * + * @return Whether the entity is invisible + */ ++ @Override // Paper - move invisibility up to Entity + public boolean isInvisible(); + + // Paper start +@@ -1016,6 +1018,57 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource void clearActiveItem(); // Paper end diff --git a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch index 6c33be9317a6..f378113a44ad 100644 --- a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index 434fde52986ba07d7209ff47483f74fe31e8ebe7..0c7204e390f44b649fc26cd46152abeb * Creates and returns the next EntityId available. *

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..2e2c8d7d2e2c27e2f1264a267d589b2c790f366b 100644 +index efe812b4d47df6f8b5ba54ec4526f3dcd20f180f..a09640dce6f61f808f516f5569e08e9e6a2f2b53 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -891,5 +891,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -911,5 +911,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Deprecated @NotNull Set getTrackedPlayers(); diff --git a/patches/api/0329-Entity-powdered-snow-API.patch b/patches/api/0329-Entity-powdered-snow-API.patch index d31b58855ca9..b5b1dbedbdaf 100644 --- a/patches/api/0329-Entity-powdered-snow-API.patch +++ b/patches/api/0329-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 2e2c8d7d2e2c27e2f1264a267d589b2c790f366b..bdc2bbeddc47587334a8e92f5e0728f3c50218f6 100644 +index a09640dce6f61f808f516f5569e08e9e6a2f2b53..336cd1830182d4aac0fc7b5be629da4fc78c5cf8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -918,5 +918,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -938,5 +938,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/api/0339-Freeze-Tick-Lock-API.patch b/patches/api/0339-Freeze-Tick-Lock-API.patch index 8d16a0e1d365..ae7c328cc6e4 100644 --- a/patches/api/0339-Freeze-Tick-Lock-API.patch +++ b/patches/api/0339-Freeze-Tick-Lock-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index bdc2bbeddc47587334a8e92f5e0728f3c50218f6..e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7 100644 +index 336cd1830182d4aac0fc7b5be629da4fc78c5cf8..5be7daff9077f35aa1d3abf747f7d147a1532b55 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent - */ - boolean isFrozen(); +@@ -303,6 +303,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + boolean isInvisible(); + // Paper end - move invisibility up to Entity + // Paper start - Freeze Tick Lock API + /** diff --git a/patches/api/0368-Collision-API.patch b/patches/api/0368-Collision-API.patch index fc4f5486d99f..61881abf50dc 100644 --- a/patches/api/0368-Collision-API.patch +++ b/patches/api/0368-Collision-API.patch @@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97 // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 948d6a08ff459afd5d4d5b151c41d94d1d5847b6..4ea16c106cfab12ebc753781fb7f406330c3f25c 100644 +index 82c9e07a059bc481d877c7fbb2fbf866bf607017..7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -968,4 +968,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -988,4 +988,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch index 6d0cf289d928..38a3a4452cc8 100644 --- a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch +++ b/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index d083cffe0b61642bf4c4ea0fecc529090702042f..ab6ba48c76271f60fc51f758ff823e45be4bce93 100644 +index 41ca8fea2aede178bdbe87c05588bce4f2faf8e6..aa20ec645476b2cbb0330c206f163094aebf238e 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1201,5 +1201,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1203,5 +1203,23 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource */ @Deprecated void setHurtDirection(float hurtDirection); diff --git a/patches/api/0381-Add-entity-knockback-API.patch b/patches/api/0381-Add-entity-knockback-API.patch index 56310d9bef73..cf91cd830430 100644 --- a/patches/api/0381-Add-entity-knockback-API.patch +++ b/patches/api/0381-Add-entity-knockback-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ab6ba48c76271f60fc51f758ff823e45be4bce93..21ddbe3399b1b4a4d51c5a752fa72c5d8832b415 100644 +index aa20ec645476b2cbb0330c206f163094aebf238e..70953573a7bcfa682dbaeaa8e3db0c847b254fdd 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1219,5 +1219,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1221,5 +1221,17 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource this.swingOffHand(); } } diff --git a/patches/api/0388-ItemStack-damage-API.patch b/patches/api/0388-ItemStack-damage-API.patch index f0444dae8476..f2c4cc435515 100644 --- a/patches/api/0388-ItemStack-damage-API.patch +++ b/patches/api/0388-ItemStack-damage-API.patch @@ -8,10 +8,10 @@ to simulate damage done to an itemstack and all the logic associated with damaging them diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 21ddbe3399b1b4a4d51c5a752fa72c5d8832b415..cb5ba5d115406d12a2af0811fcfbf510f836b03b 100644 +index 70953573a7bcfa682dbaeaa8e3db0c847b254fdd..041ff387a0f9e8037e2834118ef241ddb8970907 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1231,5 +1231,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1233,5 +1233,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param directionZ The relative z position of the knockback source direction */ void knockback(double strength, double directionX, double directionZ); diff --git a/patches/api/0395-Add-Sneaking-API-for-Entities.patch b/patches/api/0395-Add-Sneaking-API-for-Entities.patch index 224f78420803..70178866ab90 100644 --- a/patches/api/0395-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0395-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4ea16c106cfab12ebc753781fb7f406330c3f25c..b6f7aae6cd7d4364caf89c46e55c65961f8dae91 100644 +index 7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9..e0e93cb945202890387c1dc3c32927525e40296c 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -779,6 +779,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -799,6 +799,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); @@ -35,7 +35,7 @@ index 4ea16c106cfab12ebc753781fb7f406330c3f25c..b6f7aae6cd7d4364caf89c46e55c6596 * Get the category of spawn to which this entity belongs. * diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8a862dbf093ca0812aa1ce8def1e650380c303d0..bfa5a218576c9db147da75ec39cf8a8f6e9f6157 100644 +index e855cddf37c453ea3f8f0f4fc21dd2358258e28d..6afced1da637e4162972b0ff1f6c9cf42c256a02 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -417,6 +417,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0401-Add-Entity-Body-Yaw-API.patch b/patches/api/0401-Add-Entity-Body-Yaw-API.patch index ebcecf2aca68..8d0776b93e26 100644 --- a/patches/api/0401-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0401-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b6f7aae6cd7d4364caf89c46e55c65961f8dae91..04cf35bce80d5940dec2913ca74a0678be3c1c57 100644 +index e0e93cb945202890387c1dc3c32927525e40296c..18a2f82ecf9ca3ecb80053666d0de192e5185531 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -986,6 +986,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1006,6 +1006,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return true if in powdered snow. */ boolean isInPowderedSnow(); @@ -53,10 +53,10 @@ index b6f7aae6cd7d4364caf89c46e55c65961f8dae91..04cf35bce80d5940dec2913ca74a0678 // Paper start - Collision API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b9f98279789fe26181aa9c7aa253877d916034be..2dbb61df25967739c5a8308d6d89be20136816ba 100644 +index 3a26b3c40f877a454c3c76b68b86776f05950002..b7b87b2962eabcf2e8864335e4da22c0b9da8e5c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java -@@ -1278,5 +1278,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource +@@ -1280,5 +1280,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource * @param amount the amount of damage to do */ void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount); diff --git a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch b/patches/api/0412-Folia-scheduler-and-owned-region-API.patch index 8d194d537502..71062196c9eb 100644 --- a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0412-Folia-scheduler-and-owned-region-API.patch @@ -769,10 +769,10 @@ index d433a9d2fe0bb487865fec33307cc4c45af475a0..f819de247080d58803a2851a4cab28d2 + // Paper end - Folia region threading API } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 04cf35bce80d5940dec2913ca74a0678be3c1c57..ef202ad243884c4254f45be760c42abf653cbc8e 100644 +index 18a2f82ecf9ca3ecb80053666d0de192e5185531..a5602bf27965a8aac97aa5279a23e785729a4921 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1046,4 +1046,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1066,4 +1066,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox); // Paper end - Collision API diff --git a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch index 7be05d742135..85895ba202f8 100644 --- a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index ef202ad243884c4254f45be760c42abf653cbc8e..d6e6d7140de4588f6b9469988749bccbe848f3ef 100644 +index a5602bf27965a8aac97aa5279a23e785729a4921..cbea8b9088fff5f08a47f6b26d7554d00710eb9f 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1057,4 +1057,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1077,4 +1077,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler(); // Paper end - Folia schedulers diff --git a/patches/api/0426-Expand-Pose-API.patch b/patches/api/0426-Expand-Pose-API.patch index 7548f51038ca..b016f55d9beb 100644 --- a/patches/api/0426-Expand-Pose-API.patch +++ b/patches/api/0426-Expand-Pose-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d6e6d7140de4588f6b9469988749bccbe848f3ef..d9929d9311e4b2b0ae13a8f6f13563257263f298 100644 +index cbea8b9088fff5f08a47f6b26d7554d00710eb9f..252ae4b7a002b34533988e0a574a24af8573a125 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -796,6 +796,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -816,6 +816,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @param sneak true if the entity should be sneaking */ void setSneaking(boolean sneak); diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0586-Missing-Entity-API.patch index 501d3329dd37..b2f850af74f4 100644 --- a/patches/server/0586-Missing-Entity-API.patch +++ b/patches/server/0586-Missing-Entity-API.patch @@ -29,6 +29,7 @@ public net.minecraft.world.entity.animal.AbstractSchoolingFish schoolSize public net.minecraft.world.entity.animal.Rabbit moreCarrotTicks public net.minecraft.world.entity.AreaEffectCloud ownerUUID public net.minecraft.world.entity.animal.MushroomCow stewEffects +public net.minecraft.world.entity.Entity FLAG_INVISIBLE Co-authored-by: Nassim Jahnke Co-authored-by: Jake Potrebic @@ -37,6 +38,7 @@ Co-authored-by: SoSeDiK Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki +Co-authored-by: FireInstall diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java index 8117578ced94aa6bf01871f6526a388385c4adf2..59699c59fdfc611177fdb3136f84ab539b17d9c9 100644 @@ -667,6 +669,28 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee + } + // Paper end } +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..dd1ca63d2d6e4c8606c28380f81b79b7ee211a35 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +@@ -1078,4 +1078,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return set; + } + // Paper end ++ ++ // Paper start - move up invisibility ++ @Override ++ public boolean isInvisible() { ++ return this.getHandle().isInvisible(); ++ } ++ ++ @Override ++ public void setInvisible(boolean invisible) { ++ this.getHandle().persistentInvisibility = invisible; ++ this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); ++ } ++ // Paper end - move up invisibility + } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..e1a2f0924da6ebcdf332040f922226af5d8a2d45 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -761,12 +785,22 @@ index 2cec61a1bb050c1ef81c5fc3d0afafe9ff29d459..97fa4e1e70203194bd939618b2fad926 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 9ce82b203e37ff1f5a7618fe864ed7616bd8d52e..9a7a670c1e99674e8a554342165b7b77001083fc 100644 +index 9ce82b203e37ff1f5a7618fe864ed7616bd8d52e..6218f15194b7ae0b17f7f1dab78b1337779edb27 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -913,6 +913,22 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { - this.getHandle().persistentInvisibility = invisible; - this.getHandle().setSharedFlag(5, invisible); +@@ -905,14 +905,29 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { + + @Override + public boolean isInvisible() { +- return this.getHandle().isInvisible(); ++ return super.isInvisible(); // Paper - move invisibility up to Entity - diff on change + } + + @Override + public void setInvisible(boolean invisible) { +- this.getHandle().persistentInvisibility = invisible; +- this.getHandle().setSharedFlag(5, invisible); ++ super.setInvisible(invisible); // Paper - move invisibility up to Entity } + // Paper start + @Override diff --git a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch index 436c536f748c..b57a9d9bb217 100644 --- a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 822666e1199e0851136d88b2b556d8d17843d902..e6ef67a7a2eab5314c95e751895b4d4ce71c91b8 100644 +index 7dbbf0884b70acb37c3400364736fa8f6b68c964..5dce3d38ecd7b7639f02f3e1e92f3723f4a42c39 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2078,6 +2078,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -27,10 +27,10 @@ index 822666e1199e0851136d88b2b556d8d17843d902..e6ef67a7a2eab5314c95e751895b4d4c return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..411e2eed16d5b774900fc12f5ad782ab229dde97 100644 +index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb1073ed9f07 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1077,5 +1077,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1077,6 +1077,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } return set; } @@ -45,7 +45,8 @@ index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..411e2eed16d5b774900fc12f5ad782ab + return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason); + } // Paper end - } + + // Paper start - move up invisibility diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 609b103cb9af3b0554bf1116306874fe98c8534c..3f582c5653e13875cce4ef8ecd279d8a3d2b2dc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/patches/server/0677-Entity-powdered-snow-API.patch b/patches/server/0677-Entity-powdered-snow-API.patch index 9976726fc5bd..e06e388df9a7 100644 --- a/patches/server/0677-Entity-powdered-snow-API.patch +++ b/patches/server/0677-Entity-powdered-snow-API.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Entity powdered snow API public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 411e2eed16d5b774900fc12f5ad782ab229dde97..71f9b7bbbabae9291fdb9f902f3f69c13e715c0e 100644 +index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e53820a9be97 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1087,5 +1087,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1087,6 +1087,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { this.entity.setRot(location.getYaw(), location.getPitch()); return !this.entity.valid && this.entity.level().addFreshEntity(this.entity, reason); } @@ -20,7 +20,8 @@ index 411e2eed16d5b774900fc12f5ad782ab229dde97..71f9b7bbbabae9291fdb9f902f3f69c1 + return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed. + } // Paper end - } + + // Paper start - move up invisibility diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java diff --git a/patches/server/0772-Collision-API.patch b/patches/server/0772-Collision-API.patch index c4952054b538..da2d02ef43b0 100644 --- a/patches/server/0772-Collision-API.patch +++ b/patches/server/0772-Collision-API.patch @@ -22,13 +22,14 @@ index fbcf1320ef9c1817b24aa8724cd6cf07319c20b9..5680e9772a2d90e997d2d0aacdda9edd // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 9ea189c26c6a5fae84bcc7ed098426d8c001cd5e..b7fceba1c7138a5c1d78bf058c9f2d32dbc1d292 100644 +index a47e8994b52576d88fa90b7a86cbe0fb7493fa6d..3cdc8787c6a481da6cb294208eebce0636a58d4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1125,4 +1125,19 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { - return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed. +@@ -1138,4 +1138,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); } - // Paper end + // Paper end - move up invisibility ++ + // Paper start - Collision API + @Override + public boolean collidesAt(@org.jetbrains.annotations.NotNull Location location) { diff --git a/patches/server/0798-Add-entity-knockback-API.patch b/patches/server/0798-Add-entity-knockback-API.patch index 7086303073f0..afe4ca229a1f 100644 --- a/patches/server/0798-Add-entity-knockback-API.patch +++ b/patches/server/0798-Add-entity-knockback-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e559af05c58b7d9c940cea9f48c0f4bd0aad756c..cb585a82e52697d84f3da25a150b663c8c286f58 100644 +index 354c32f67d06228477c723f7e4dbe27116e59a9b..4363f55707101362c1df60b73ab23d3d4c9c0675 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1073,5 +1073,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1072,5 +1072,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); } diff --git a/patches/server/0816-ItemStack-damage-API.patch b/patches/server/0816-ItemStack-damage-API.patch index 933e8cf6e8bf..9525df8c4c4e 100644 --- a/patches/server/0816-ItemStack-damage-API.patch +++ b/patches/server/0816-ItemStack-damage-API.patch @@ -11,10 +11,10 @@ the logic associated with damaging them public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index cb585a82e52697d84f3da25a150b663c8c286f58..7ba726584ce4a58654b8a8b9604f0cca762b3f42 100644 +index 4363f55707101362c1df60b73ab23d3d4c9c0675..ed436eed7617665e77627dd05d17b8e5a7366f25 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1074,6 +1074,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1073,6 +1073,53 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); } diff --git a/patches/server/0817-Friction-API.patch b/patches/server/0817-Friction-API.patch index cb41b035bb12..c7825d86c15b 100644 --- a/patches/server/0817-Friction-API.patch +++ b/patches/server/0817-Friction-API.patch @@ -133,10 +133,10 @@ index 1a291dd8a287db30e71dcb315599fc4b038764c4..30d62ee4d5cd2ddacb8783b5bbbf475d public int getHealth() { return this.getHandle().health; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7ba726584ce4a58654b8a8b9604f0cca762b3f42..d7492b969750fddca8bf09fdf2e91b146db03dc4 100644 +index ed436eed7617665e77627dd05d17b8e5a7366f25..e8ef40fed546608d995fd31dc8a9721c00537749 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1121,6 +1121,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1120,6 +1120,18 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { }); } diff --git a/patches/server/0843-Add-Entity-Body-Yaw-API.patch b/patches/server/0843-Add-Entity-Body-Yaw-API.patch index 1131f49d450b..526a085ebb9a 100644 --- a/patches/server/0843-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0843-Add-Entity-Body-Yaw-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 69dc7d9cc9ebd681d842099e2de521fd11ff5242..ba915f1b3cd00c8afe39ece9c9e68737673777f5 100644 +index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff96911384d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1136,6 +1136,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -38,13 +38,13 @@ index 69dc7d9cc9ebd681d842099e2de521fd11ff5242..ba915f1b3cd00c8afe39ece9c9e68737 + return this.entity.getBukkitYaw(); + } // Paper end - // Paper start - Collision API - @Override + + // Paper start - move up invisibility diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index d7492b969750fddca8bf09fdf2e91b146db03dc4..3302d8e9b7c2c48b20dd257f4699b263d3bc52dc 100644 +index e8ef40fed546608d995fd31dc8a9721c00537749..fbe1d5051f8767db240e4d0c256f4a1088c4339c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -1113,6 +1113,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -1112,6 +1112,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.damageItemStack0(this.getHandle().getItemBySlot(nmsSlot), amount, nmsSlot); } diff --git a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch index 1df4442214fd..a93b609b72ae 100644 --- a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 282a1cebc0cdb6253d024dd399ef794335883662..fec2f96cfc42559c44d5d2e907d0706c674dfda7 100644 +index 1de3a2ed64dcd222bc90d3917c08e12af56450b4..fd7a3176cdd07f50e4e56d98827672042cdf5944 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1192,4 +1192,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1206,4 +1206,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return !this.getHandle().level().noCollision(this.getHandle(), aabb); } // Paper end - Collision API From b6001403e9703cadaa6e8c8558e732b91c3c6d6e Mon Sep 17 00:00:00 2001 From: maxcom1 <46265094+maxcom1@users.noreply.github.com> Date: Sat, 23 Mar 2024 22:26:17 +0100 Subject: [PATCH 13/16] Add methods to change entity physics (#10334) --- ...mplement-PlayerRecipeBookClickEvent.patch} | 0 patches/api/0201-Improve-Arrow-API.patch | 43 ------------------- ...0202-Support-components-in-ItemMeta.patch} | 2 +- ...TargetReasons-for-1.16-mob-behavior.patch} | 0 ...patch => 0204-Add-entity-liquid-API.patch} | 0 ...eResultEvent-PrepareGrindstoneEvent.patch} | 0 ...ent.patch => 0206-Add-BellRingEvent.patch} | 0 ...support.patch => 0207-Brand-support.patch} | 0 ...PI.patch => 0208-Add-moon-phase-API.patch} | 0 ...PickupItemAnimation-to-LivingEntity.patch} | 2 +- ...I.patch => 0210-Add-more-Evoker-API.patch} | 0 ...Add-methods-to-get-translation-keys.patch} | 2 +- ...te-HoverEvent-from-ItemStack-Entity.patch} | 0 ...l-open-container-api-to-HumanEntity.patch} | 0 ...-Counter-to-allow-plugins-to-use-va.patch} | 0 ...king.patch => 0215-Entity-isTicking.patch} | 0 ....patch => 0216-Villager-resetOffers.patch} | 0 ...tch => 0217-Player-elytra-boost-API.patch} | 0 ...Add-getOfflinePlayerIfCached-String.patch} | 0 ...ch => 0219-Add-ignore-discounts-API.patch} | 0 ...> 0220-Item-no-age-no-player-pickup.patch} | 2 +- ...221-Beacon-API-custom-effect-ranges.patch} | 0 ...tch => 0222-Add-API-for-quit-reason.patch} | 0 ...patch => 0223-Add-Destroy-Speed-API.patch} | 2 +- ...24-Add-LivingEntity-clearActiveItem.patch} | 2 +- ...=> 0225-Add-PlayerItemCooldownEvent.patch} | 0 ...PI.patch => 0226-More-lightning-API.patch} | 0 ...h => 0227-Add-PlayerShearBlockEvent.patch} | 0 ...228-Player-Chunk-Load-Unload-Events.patch} | 0 ...-Expose-LivingEntity-hurt-direction.patch} | 2 +- ...OBSTRUCTED-reason-to-BedEnterResult.patch} | 0 ...atch => 0231-Added-PlayerTradeEvent.patch} | 0 ...atch => 0232-Add-TargetHitEvent-API.patch} | 0 ...233-Additional-Block-Material-API-s.patch} | 2 +- ...t-Material-from-Boats-and-Minecarts.patch} | 0 ...-Add-PlayerFlowerPotManipulateEvent.patch} | 0 ...h => 0236-Zombie-API-breaking-doors.patch} | 0 ...=> 0237-Add-EntityLoadCrossbowEvent.patch} | 0 ...0238-Added-WorldGameRuleChangeEvent.patch} | 0 ...-Added-ServerResourcesReloadedEvent.patch} | 0 ...> 0240-Add-BlockFailedDispenseEvent.patch} | 0 ...-Added-PlayerLecternPageChangeEvent.patch} | 0 ...-Added-PlayerLoomPatternSelectEvent.patch} | 0 ...act-interaction-point-in-PlayerInte.patch} | 0 ...I.patch => 0244-Add-sendOpLevel-API.patch} | 0 ...try.patch => 0245-Add-PaperRegistry.patch} | 0 ...h => 0246-Add-StructuresLocateEvent.patch} | 0 ...h => 0247-Add-BlockPreDispenseEvent.patch} | 0 ...Added-PlayerChangeBeaconEffectEvent.patch} | 0 ...-PlayerStonecutterRecipeSelectEvent.patch} | 0 ...eash-variable-to-EntityUnleashEvent.patch} | 0 ...atch => 0251-add-DragonEggFormEvent.patch} | 0 ...Event.patch => 0252-EntityMoveEvent.patch} | 0 ...-adding-items-to-BlockDropItemEvent.patch} | 0 ...inThreadExecutor-to-BukkitScheduler.patch} | 0 ...entity-allow-attribute-registration.patch} | 0 ...s.patch => 0256-Add-missing-effects.patch} | 0 ...atch => 0257-Expose-Tracked-Players.patch} | 0 ...ache-the-result-of-Material-isBlock.patch} | 0 ...atch => 0259-Add-worldborder-events.patch} | 0 ...=> 0260-added-PlayerNameEntityEvent.patch} | 0 ...h => 0261-Add-recipe-to-cook-events.patch} | 0 ...patch => 0262-Add-Block-isValidTool.patch} | 0 ....patch => 0263-Expand-world-key-API.patch} | 0 ...y-API.patch => 0264-Item-Rarity-API.patch} | 0 ...tch => 0265-Expose-protocol-version.patch} | 0 ...add-isDeeplySleeping-to-HumanEntity.patch} | 0 ...add-consumeFuel-to-FurnaceBurnEvent.patch} | 0 ...-set-drop-chance-to-EntityEquipment.patch} | 0 ... => 0269-Added-PlayerDeepSleepEvent.patch} | 0 ...ld-API.patch => 0270-More-World-API.patch} | 0 ... 0271-Added-PlayerBedFailEnterEvent.patch} | 0 ...acon-activation-deactivation-events.patch} | 0 ...> 0273-PlayerMoveEvent-Improvements.patch} | 0 ...-RespawnFlags-to-PlayerRespawnEvent.patch} | 0 ...> 0275-Add-more-WanderingTrader-API.patch} | 0 ...dd-EntityBlockStorage-clearEntities.patch} | 0 ...ssage-to-PlayerAdvancementDoneEvent.patch} | 0 ...close.patch => 0278-Inventory-close.patch} | 0 ...-in-sunlight-API-for-Phantoms-and-S.patch} | 0 ...atch => 0280-Add-basic-Datapack-API.patch} | 0 ...itions-to-PlayerGameModeChangeEvent.patch} | 0 ... => 0282-ItemStack-repair-check-API.patch} | 0 ....patch => 0283-More-Enchantment-API.patch} | 0 ...PI.patch => 0284-Add-Mob-lookAt-API.patch} | 0 ...ta.patch => 0285-ItemStack-editMeta.patch} | 0 ... => 0286-Add-EntityInsideBlockEvent.patch} | 0 ...87-Attributes-API-for-item-defaults.patch} | 0 ...ause-to-Weather-ThunderChangeEvents.patch} | 0 ...patch => 0289-More-Lidded-Block-API.patch} | 0 ... => 0290-Add-PlayerKickEvent-causes.patch} | 2 +- ...0291-Add-PufferFishStateChangeEvent.patch} | 0 ...h => 0292-Add-BellRevealRaiderEvent.patch} | 0 ...93-Add-ElderGuardianAppearanceEvent.patch} | 0 ...0294-Add-more-line-of-sight-methods.patch} | 0 ... => 0295-Add-WaterBottleSplashEvent.patch} | 0 ... => 0296-Add-more-LimitedRegion-API.patch} | 0 ...PI.patch => 0297-Missing-Entity-API.patch} | 27 +++++++++--- ...ch => 0298-Adds-PlayerArmSwingEvent.patch} | 0 ...dd-PlayerSignCommandPreprocessEvent.patch} | 0 ...array-elements-in-command-arguments.patch} | 0 ...inger-API.patch => 0301-Stinger-API.patch} | 2 +- ...-to-contain-the-source-jars-in-stac.patch} | 0 ...tch => 0303-Add-PlayerSetSpawnEvent.patch} | 0 ...=> 0304-Added-EntityDamageItemEvent.patch} | 0 ...Make-EntityUnleashEvent-cancellable.patch} | 0 ...arget-without-changing-other-things.patch} | 0 ...ch => 0307-Add-BlockBreakBlockEvent.patch} | 0 ...pers-for-left-right-click-to-Action.patch} | 0 ...revent-NBT-copy-in-smithing-recipes.patch} | 0 ...patch => 0310-More-CommandBlock-API.patch} | 0 ...-missing-team-sidebar-display-slots.patch} | 0 ...0312-add-back-EntityPortalExitEvent.patch} | 0 ...-find-targets-for-lightning-strikes.patch} | 0 ... 0314-Get-entity-default-attributes.patch} | 0 ...d-API.patch => 0315-Left-handed-API.patch} | 0 ...tch => 0316-Add-critical-damage-API.patch} | 0 ...ch => 0317-Add-more-advancement-API.patch} | 0 ...0318-Fix-issues-with-mob-conversion.patch} | 0 ...ollidable-methods-to-various-places.patch} | 0 ...-ram-API.patch => 0320-Goat-ram-API.patch} | 0 ...dd-API-for-resetting-a-single-score.patch} | 0 ...2-Add-Raw-Byte-Entity-Serialization.patch} | 4 +- ...0323-Add-PlayerItemFrameChangeEvent.patch} | 0 ...low-delegation-to-vanilla-chunk-gen.patch} | 0 ...patch => 0325-Add-more-Campfire-API.patch} | 0 ...eCollisionEvent-move-HandlerList-up.patch} | 0 ... => 0327-Improve-scoreboard-entries.patch} | 0 ...ch => 0328-Entity-powdered-snow-API.patch} | 4 +- ...0329-Add-API-for-item-entity-health.patch} | 0 ...-canSmelt-methods-to-FurnaceInvento.patch} | 0 ...le-API.patch => 0331-Bucketable-API.patch} | 0 ...-for-default-config-comment-parsing.patch} | 0 ...anilla-BiomeProvider-from-WorldInfo.patch} | 0 ...4-Multiple-Entries-with-Scoreboards.patch} | 0 ...n-strange-EventHandler-return-types.patch} | 0 ...atch => 0336-Multi-Block-Change-API.patch} | 2 +- ...ent.patch => 0337-Fix-NotePlayEvent.patch} | 0 ....patch => 0338-Freeze-Tick-Lock-API.patch} | 8 ++-- ...lphin-API.patch => 0339-Dolphin-API.patch} | 0 ...h => 0340-More-PotionEffectType-API.patch} | 0 ...command-sender-which-forwards-feedb.patch} | 0 ...h => 0342-Implement-regenerateChunk.patch} | 0 ...gs.patch => 0343-Add-GameEvent-tags.patch} | 0 ...tch => 0344-Furnace-RecipesUsed-API.patch} | 0 ...gurable-sculk-sensor-listener-range.patch} | 0 ...d-missing-block-data-mins-and-maxes.patch} | 0 ...s.patch => 0347-Custom-Potion-Mixes.patch} | 0 ...Expose-furnace-minecart-push-values.patch} | 0 ...I.patch => 0349-More-Projectile-API.patch} | 25 +++++++---- ...ch => 0350-Add-getComputedBiome-API.patch} | 0 ...h => 0351-Add-enchantWithLevels-API.patch} | 0 ... 0352-Add-TameableDeathMessageEvent.patch} | 0 ...hange-the-podium-of-the-EnderDragon.patch} | 0 ...-blockstate-in-EntityBreakDoorEvent.patch} | 0 ...ing-amount-to-PlayerItemDamageEvent.patch} | 0 ...> 0356-WorldCreator-keepSpawnLoaded.patch} | 0 ...Event-and-CollarColorable-interface.patch} | 0 ...> 0358-Add-PlayerStopUsingItemEvent.patch} | 0 ...tch => 0359-Expand-FallingBlock-API.patch} | 0 ...dd-method-isTickingWorlds-to-Bukkit.patch} | 0 ... => 0361-Add-WardenAngerChangeEvent.patch} | 0 ...I.patch => 0362-Nameable-Banner-API.patch} | 0 ...atch => 0363-Add-Player-getFishHook.patch} | 0 ...API.patch => 0364-More-Teleport-API.patch} | 2 +- ... => 0365-Add-EntityPortalReadyEvent.patch} | 0 ...tom-Chat-Completion-Suggestions-API.patch} | 0 ...ion-API.patch => 0367-Collision-API.patch} | 4 +- ...API.patch => 0368-Block-Ticking-API.patch} | 0 ...369-Add-NamespacedKey-biome-methods.patch} | 0 ...o-load-resources-from-LibraryLoader.patch} | 0 ...serialization-deserialization-for-P.patch} | 0 ...rameter-to-ProjectileSource-launchP.patch} | 0 ...limit-in-YamlConfigOptions-and-incr.patch} | 0 ... => 0374-Add-getDrops-to-BlockState.patch} | 0 ...-Add-PlayerInventorySlotChangeEvent.patch} | 0 ... 0376-Elder-Guardian-appearance-API.patch} | 0 ...ow-changing-bed-s-occupied-property.patch} | 0 ...d-EquipmentSlot-convenience-methods.patch} | 0 ...swingHand-EquipmentSlot-convenience.patch} | 0 ...ch => 0380-Add-entity-knockback-API.patch} | 0 ... => 0381-Added-EntityToggleSitEvent.patch} | 0 ...patch => 0382-Add-Moving-Piston-API.patch} | 0 ...0383-Add-PrePlayerAttackEntityEvent.patch} | 0 ... 0384-Add-Player-Warden-Warning-API.patch} | 0 ...a-friendly-methods-to-update-trades.patch} | 0 ...386-Add-paper-dumplisteners-command.patch} | 0 ....patch => 0387-ItemStack-damage-API.patch} | 0 ...patch => 0388-Add-Tick-TemporalUnit.patch} | 0 ...tion-API.patch => 0389-Friction-API.patch} | 2 +- ... 0390-Player-Entity-Tracking-Events.patch} | 0 ...atch => 0391-Add-missing-Fluid-type.patch} | 0 ...ments.patch => 0392-fix-Instruments.patch} | 0 ...tch => 0393-Add-BlockLockCheckEvent.patch} | 0 ... 0394-Add-Sneaking-API-for-Entities.patch} | 4 +- ....patch => 0395-Improve-PortalEvents.patch} | 0 ...k-state-to-BlockExplodeEvent-and-En.patch} | 0 ...atch => 0397-Flying-Fall-Damage-API.patch} | 0 ...eplace-ItemFlag.HIDE_POTION_EFFECTS.patch} | 0 ...en-API.patch => 0399-Win-Screen-API.patch} | 2 +- ...tch => 0400-Add-Entity-Body-Yaw-API.patch} | 4 +- ...or-InventoryBlockStartEvent-subclas.patch} | 0 ...=> 0402-Add-EntityFertilizeEggEvent.patch} | 0 ...temEvent-and-EntityCompostItemEvent.patch} | 0 ...API.patch => 0404-Add-Shearable-API.patch} | 2 +- ...Fix-SpawnEggMeta-get-setSpawnedType.patch} | 0 ... 0406-Add-Mob-Experience-reward-API.patch} | 0 ... => 0407-Expand-PlayerItemMendEvent.patch} | 0 ... => 0408-Add-transient-modifier-API.patch} | 0 ...he-experimental-smithing-inventory-.patch} | 0 ...to-remove-all-active-potion-effects.patch} | 2 +- ...olia-scheduler-and-owned-region-API.patch} | 4 +- ...2-Add-event-for-player-editing-sign.patch} | 0 ...413-Add-Sign-getInteractableSideFor.patch} | 0 ...t-API.patch => 0414-Fix-BanList-API.patch} | 0 ....patch => 0415-Add-whitelist-events.patch} | 0 ...API-for-updating-recipes-on-clients.patch} | 0 ...tch => 0417-Add-PlayerFailMoveEvent.patch} | 0 ...-custom-statistic-criteria-creation.patch} | 0 ...tch => 0419-SculkCatalyst-bloom-API.patch} | 0 ...API-for-an-entity-s-scoreboard-name.patch} | 4 +- ...lace-methods-with-old-StructureType.patch} | 0 ... => 0422-Add-Listing-API-for-Player.patch} | 0 ...d-BlockFace-during-BlockDamageEvent.patch} | 0 ...h => 0424-Fix-NPE-on-Boat-getStatus.patch} | 0 ...e-API.patch => 0425-Expand-Pose-API.patch} | 4 +- ...MerchantRecipe-add-copy-constructor.patch} | 0 ...patch => 0427-More-DragonBattle-API.patch} | 0 ...tch => 0428-Add-PlayerPickItemEvent.patch} | 0 ...=> 0429-Allow-trident-custom-damage.patch} | 0 ...pose-hand-during-BlockCanBuildEvent.patch} | 0 ...t-setBurnTime-to-valid-short-values.patch} | 0 ... 0432-Add-OfflinePlayer-isConnected.patch} | 2 +- ...titleOverride-to-InventoryOpenEvent.patch} | 0 ...roper-checking-of-empty-item-stacks.patch} | 0 ...dItemsEvent-throwing-exception-when.patch} | 0 ...> 0436-Add-player-idle-duration-API.patch} | 0 ...e-collision-shape-of-a-block-before.patch} | 0 ...redicate-for-blocks-when-raytracing.patch} | 0 ...h-event-for-all-player-interactions.patch} | 0 ...440-Add-UUID-attribute-modifier-API.patch} | 0 ... => 0441-Expand-LingeringPotion-API.patch} | 0 ...y-durability-check-in-ItemStack-isS.patch} | 0 ...tch => 0443-Add-Structure-check-API.patch} | 0 ...dd-missing-Experimental-annotations.patch} | 0 ...tch => 0445-Add-more-scoreboard-API.patch} | 0 ...stry.patch => 0446-Improve-Registry.patch} | 0 ...h => 0447-Add-experience-points-API.patch} | 0 ...h => 0448-Add-missing-InventoryType.patch} | 0 ...h => 0449-Add-drops-to-shear-events.patch} | 0 ... => 0450-Add-HiddenPotionEffect-API.patch} | 2 +- ...> 0451-Add-PlayerShieldDisableEvent.patch} | 0 ...mpty-String-in-NamespacedKey.fromSt.patch} | 0 ...-Add-BlockStateMeta-clearBlockState.patch} | 0 ...54-Expose-LootTable-of-DecoratedPot.patch} | 0 ...h => 0455-Add-ShulkerDuplicateEvent.patch} | 0 ...dd-api-for-spawn-egg-texture-colors.patch} | 0 ... => 0457-Add-Lifecycle-Event-system.patch} | 0 ...nduit-API.patch => 0458-Conduit-API.patch} | 0 ...patch => 0459-ItemStack-Tooltip-API.patch} | 0 ...Snapshot-includeLightData-parameter.patch} | 0 ...PI.patch => 0461-Add-FluidState-API.patch} | 0 ...patch => 0462-add-number-format-api.patch} | 0 ...patch => 0463-improve-BanList-types.patch} | 0 ...=> 0464-Suspicious-Effect-Entry-API.patch} | 0 ....patch => 0465-Fix-DamageSource-API.patch} | 0 ...I.patch => 0466-Expanded-Hopper-API.patch} | 0 ...tables-to-prevent-unexpected-issues.patch} | 0 ...0385-Add-PlayerRecipeBookClickEvent.patch} | 0 patches/server/0385-Improve-Arrow-API.patch | 38 ---------------- ...-Hide-sync-chunk-writes-behind-flag.patch} | 0 ...7-Add-permission-for-command-blocks.patch} | 0 ...position-and-AABB-are-never-invalid.patch} | 2 +- ...d-Difficulty-Remembering-Difficulty.patch} | 0 ...atch => 0390-Paper-dumpitem-command.patch} | 0 ...Legacy-Component-serialization-size.patch} | 0 ...Plugin-Tickets-to-API-Chunk-Methods.patch} | 0 ...-Add-BlockStateMeta-clearBlockState.patch} | 0 ...394-Support-old-UUID-format-for-NBT.patch} | 0 ...vert-legacy-attributes-in-Item-Meta.patch} | 0 ...-not-accept-invalid-client-settings.patch} | 0 ...e-fix-EntityTargetLivingEntityEvent.patch} | 0 ...patch => 0398-Add-entity-liquid-API.patch} | 0 ...date-itemstack-legacy-name-and-lore.patch} | 0 ...atch => 0400-Add-PrepareResultEvent.patch} | 0 ...-for-portal-on-world-gen-entity-add.patch} | 0 ...x-arrows-never-despawning-MC-125757.patch} | 0 ...Vanilla-Command-permission-checking.patch} | 0 ...-5989.patch => 0404-Fix-SPIGOT-5989.patch} | 0 ...-Bukkit-world-container-is-not-used.patch} | 0 ...5885-Unable-to-disable-advancements.patch} | 0 ...taPlayer-leak-due-from-quitting-ear.patch} | 0 ...e-NetworkManager-Exception-Handling.patch} | 0 ...ix-some-rails-connecting-improperly.patch} | 0 ...stake-in-CB-NBT-int-deserialization.patch} | 0 ...support.patch => 0411-Brand-support.patch} | 0 ...PickupItemAnimation-to-LivingEntity.patch} | 0 ...h => 0413-Don-t-require-FACING-data.patch} | 0 ...eEvent-not-firing-for-all-use-cases.patch} | 0 ...PI.patch => 0415-Add-moon-phase-API.patch} | 0 ...rver-load-chunks-from-newer-version.patch} | 0 ...headless-pistons-from-being-created.patch} | 0 ...ent.patch => 0418-Add-BellRingEvent.patch} | 0 ...dd-zombie-targets-turtle-egg-config.patch} | 0 ...patch => 0420-Buffer-joins-to-world.patch} | 0 ...s-not-working-in-some-kick-messages.patch} | 0 ...reateEvent-needs-to-know-its-entity.patch} | 0 ...I.patch => 0423-Add-more-Evoker-API.patch} | 0 ...Add-methods-to-get-translation-keys.patch} | 0 ...te-HoverEvent-from-ItemStack-Entity.patch} | 0 ...ch => 0426-Cache-block-data-strings.patch} | 0 ...rtation-and-cancel-velocity-if-tele.patch} | 2 +- ...l-open-container-api-to-HumanEntity.patch} | 0 ...aFixerUpper-Rewrite-Rules-on-demand.patch} | 0 ...-capture-to-capture-all-items-added.patch} | 0 ...-Counter-to-allow-plugins-to-use-va.patch} | 2 +- ...track-plugin-scoreboards-by-default.patch} | 0 ...king.patch => 0433-Entity-isTicking.patch} | 2 +- ...non-whitelisted-player-when-white-l.patch} | 0 ...-Concurrency-issue-in-ShufflingList.patch} | 0 ...eset-Ender-Crystals-on-Dragon-Spawn.patch} | 0 ...-large-move-vectors-crashing-server.patch} | 0 ...atch => 0438-Optimise-getType-calls.patch} | 0 ....patch => 0439-Villager-resetOffers.patch} | 0 ...ce-order-when-capturing-blockstates.patch} | 0 ...lockpos-allocation-from-pathfinding.patch} | 0 ...em-locations-dropped-from-campfires.patch} | 0 ...3-Fix-bell-block-entity-memory-leak.patch} | 0 ...ing-up-when-item-stack-is-empty-in-.patch} | 0 ...Add-getOfflinePlayerIfCached-String.patch} | 0 ...ch => 0446-Add-ignore-discounts-API.patch} | 0 ...Toggle-for-removing-existing-dragon.patch} | 0 ...x-client-lag-on-advancement-loading.patch} | 0 ...> 0449-Item-no-age-no-player-pickup.patch} | 0 ...450-Beacon-API-custom-effect-ranges.patch} | 0 ...tch => 0451-Add-API-for-quit-reason.patch} | 0 ...ng-Trader-spawn-rate-config-options.patch} | 0 ...ch => 0453-Expose-world-spawn-angle.patch} | 0 ...patch => 0454-Add-Destroy-Speed-API.patch} | 0 ...-spawnParticle-x-y-z-precision-loss.patch} | 0 ...56-Add-LivingEntity-clearActiveItem.patch} | 0 ...=> 0457-Add-PlayerItemCooldownEvent.patch} | 0 ...rove-performance-of-the-end-generat.patch} | 0 ...PI.patch => 0459-More-lightning-API.patch} | 0 ...should-not-bypass-cramming-gamerule.patch} | 2 +- ...-missing-default-perms-for-commands.patch} | 0 ...h => 0462-Add-PlayerShearBlockEvent.patch} | 0 ....patch => 0463-Limit-recipe-packets.patch} | 0 ...-CraftSound-backwards-compatibility.patch} | 0 ...465-Player-Chunk-Load-Unload-Events.patch} | 0 ...6-Optimize-Dynamic-get-Missing-Keys.patch} | 0 ...-Expose-LivingEntity-hurt-direction.patch} | 0 ...OBSTRUCTED-reason-to-BedEnterResult.patch} | 0 ...valid-ingredient-lists-in-VillagerA.patch} | 0 ...nt.patch => 0470-Add-TargetHitEvent.patch} | 0 ... 0471-MC-4-Fix-item-position-desync.patch} | 2 +- ... 0472-Additional-Block-Material-API.patch} | 0 ...tch => 0473-Fix-harming-potion-dupe.patch} | 0 ...t-Material-from-Boats-and-Minecarts.patch} | 0 ....patch => 0475-Cache-burn-durations.patch} | 0 ...ob-spawner-spawn-egg-transformation.patch} | 0 ...ix-Not-a-string-Map-Conversion-spam.patch} | 0 ...-Add-PlayerFlowerPotManipulateEvent.patch} | 0 ...ct-event-not-being-called-sometimes.patch} | 0 ...h => 0480-Zombie-API-breaking-doors.patch} | 0 ...481-Fix-nerfed-slime-when-splitting.patch} | 0 ...=> 0482-Add-EntityLoadCrossbowEvent.patch} | 0 ...> 0483-Add-WorldGameRuleChangeEvent.patch} | 0 ...84-Add-ServerResourcesReloadedEvent.patch} | 0 ...d-settings-for-mobs-picking-up-loot.patch} | 0 ...> 0486-Add-BlockFailedDispenseEvent.patch} | 0 ...87-Add-PlayerLecternPageChangeEvent.patch} | 0 ...88-Add-PlayerLoomPatternSelectEvent.patch} | 0 ...nfigurable-door-breaking-difficulty.patch} | 0 ...ty-commands-shall-not-be-dispatched.patch} | 0 ...OIs.patch => 0491-Remove-stale-POIs.patch} | 0 ...h => 0492-Fix-villager-boat-exploit.patch} | 0 ...I.patch => 0493-Add-sendOpLevel-API.patch} | 0 ...0494-TODO-Registry-Modification-API.patch} | 0 ...h => 0495-Add-StructuresLocateEvent.patch} | 0 ...-for-requiring-a-player-participant.patch} | 2 +- ...leHitEvent-call-when-fireballs-dead.patch} | 0 ...nent-with-empty-text-instead-of-thr.patch} | 0 ...499-Make-schedule-command-per-world.patch} | 0 ...500-Configurable-max-leash-distance.patch} | 0 ...h => 0501-Add-BlockPreDispenseEvent.patch} | 0 ...2-Add-PlayerChangeBeaconEffectEvent.patch} | 0 ...e-for-always-placing-the-dragon-egg.patch} | 0 ...-PlayerStonecutterRecipeSelectEvent.patch} | 0 ...h => 0505-Expand-EntityUnleashEvent.patch} | 0 ...shield-blocking-on-dimension-change.patch} | 0 ...atch => 0507-Add-DragonEggFormEvent.patch} | 0 ...t.patch => 0508-Add-EntityMoveEvent.patch} | 0 ...isable-pathfinding-updates-on-block.patch} | 0 ... 0510-Inline-shift-direction-fields.patch} | 0 ...-adding-items-to-BlockDropItemEvent.patch} | 0 ...inThreadExecutor-to-BukkitScheduler.patch} | 0 ...entity-allow-attribute-registration.patch} | 0 ...ix-dead-slime-setSize-invincibility.patch} | 0 ...pes-should-return-an-immutable-list.patch} | 0 ...atch => 0516-Expose-Tracked-Players.patch} | 0 ...GUI.patch => 0517-Improve-ServerGUI.patch} | 0 ...518-fix-converting-txt-to-json-file.patch} | 0 ...atch => 0519-Add-worldborder-events.patch} | 0 ...h => 0520-Add-PlayerNameEntityEvent.patch} | 0 ...grindstones-from-overstacking-items.patch} | 0 ...h => 0522-Add-recipe-to-cook-events.patch} | 0 ...patch => 0523-Add-Block-isValidTool.patch} | 0 ...using-signs-inside-spawn-protection.patch} | 0 ....patch => 0525-Expand-world-key-API.patch} | 0 ...ternative-constructor-for-Rotations.patch} | 0 ...y-API.patch => 0527-Item-Rarity-API.patch} | 0 ...d-item-when-player-has-disconnected.patch} | 0 ...elist-use-configurable-kick-message.patch} | 0 ...gnore-result-of-PlayerEditBookEvent.patch} | 0 ...tch => 0531-Expose-protocol-version.patch} | 0 ...ab-completions-for-brigadier-comman.patch} | 0 ...temConsumeEvent-cancelling-properly.patch} | 0 ...patch => 0534-Add-bypass-host-check.patch} | 0 ...0535-Set-area-affect-cloud-rotation.patch} | 0 ...add-isDeeplySleeping-to-HumanEntity.patch} | 0 ...add-consumeFuel-to-FurnaceBurnEvent.patch} | 0 ...-set-drop-chance-to-EntityEquipment.patch} | 0 ...ix-PigZombieAngerEvent-cancellation.patch} | 0 ...ix-PlayerItemHeldEvent-firing-twice.patch} | 0 ...ch => 0541-Add-PlayerDeepSleepEvent.patch} | 0 ...ld-API.patch => 0542-More-World-API.patch} | 0 ...=> 0543-Add-PlayerBedFailEnterEvent.patch} | 0 ...-to-convert-between-Component-and-B.patch} | 0 ...awnEvent-fix-passed-parameter-issue.patch} | 0 ...acon-activation-deactivation-events.patch} | 0 ...dd-Channel-initialization-listeners.patch} | 0 ...mands-if-tab-completion-is-disabled.patch} | 0 ...> 0549-Add-more-WanderingTrader-API.patch} | 0 ...dd-EntityBlockStorage-clearEntities.patch} | 0 ...ssage-to-PlayerAdvancementDoneEvent.patch} | 0 ... => 0552-Add-HiddenPotionEffect-API.patch} | 0 ...close.patch => 0553-Inventory-close.patch} | 0 ...-in-sunlight-API-for-Phantoms-and-S.patch} | 0 ...atch => 0555-Add-basic-Datapack-API.patch} | 0 ...ment-variable-to-disable-server-gui.patch} | 0 ...57-Expand-PlayerGameModeChangeEvent.patch} | 0 ... => 0558-ItemStack-repair-check-API.patch} | 0 ....patch => 0559-More-Enchantment-API.patch} | 0 ...ve-range-check-for-block-placing-up.patch} | 0 ...PI.patch => 0561-Add-Mob-lookAt-API.patch} | 0 ...f-bucket-dispenses-will-succeed-for.patch} | 0 ...0563-Add-Unix-domain-socket-support.patch} | 0 ... => 0564-Add-EntityInsideBlockEvent.patch} | 0 ...65-Attributes-API-for-item-defaults.patch} | 0 ...ause-to-Weather-ThunderChangeEvents.patch} | 0 ...patch => 0567-More-Lidded-Block-API.patch} | 0 ...68-Limit-item-frame-cursors-on-maps.patch} | 0 ... => 0569-Add-PlayerKickEvent-causes.patch} | 0 ...0570-Add-PufferFishStateChangeEvent.patch} | 0 ...erBucketEmptyEvent-result-itemstack.patch} | 0 ...tedContainer-instead-of-ThreadingDe.patch} | 0 ...-to-fix-items-merging-through-walls.patch} | 0 ...h => 0574-Add-BellRevealRaiderEvent.patch} | 0 ... 0575-Fix-invulnerable-end-crystals.patch} | 0 ...76-Add-ElderGuardianAppearanceEvent.patch} | 0 ...0577-Fix-dangerous-end-portal-logic.patch} | 2 +- ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} | 0 ...-Make-item-validations-configurable.patch} | 0 ...patch => 0580-Line-Of-Sight-Changes.patch} | 0 ... => 0581-add-per-world-spawn-limits.patch} | 0 ...h => 0582-Fix-potions-splash-events.patch} | 0 ... => 0583-Add-more-LimitedRegion-API.patch} | 0 ...layerDropItemEvent-using-wrong-item.patch} | 0 ...PI.patch => 0585-Missing-Entity-API.patch} | 23 +++++++--- ...ect-for-book-edit-is-called-on-main.patch} | 0 ...of-Block-applyBoneMeal-always-being.patch} | 0 ...tChunkIfLoadedImmediately-in-places.patch} | 0 ...rom-signs-not-firing-command-events.patch} | 0 ...tch => 0590-Add-PlayerArmSwingEvent.patch} | 0 ...-event-leave-message-not-being-sent.patch} | 0 ...-for-mobs-immune-to-default-effects.patch} | 0 ...-t-apply-cramming-damage-to-players.patch} | 0 ...d-timings-for-sensors-and-behaviors.patch} | 0 ... 0595-Add-missing-forceDrop-toggles.patch} | 0 ...inger-API.patch => 0596-Stinger-API.patch} | 2 +- ...cy-issue-with-empty-map-items-in-CB.patch} | 0 ... => 0598-Add-System.out-err-catcher.patch} | 0 ...-to-contain-the-source-jars-in-stac.patch} | 0 ...AFK-kick-while-watching-end-credits.patch} | 0 ...iting-of-comments-to-server.propert.patch} | 0 ...tch => 0602-Add-PlayerSetSpawnEvent.patch} | 0 ...rs-respect-inventory-max-stack-size.patch} | 2 +- ...ize-entity-tracker-passenger-checks.patch} | 0 ...-option-for-Piglins-guarding-chests.patch} | 0 ...h => 0606-Add-EntityDamageItemEvent.patch} | 0 ...timize-indirect-passenger-iteration.patch} | 2 +- ...em-frame-map-cursor-update-interval.patch} | 0 ...609-Clear-bucket-NBT-after-dispense.patch} | 0 ...arget-without-changing-other-things.patch} | 0 ...ch => 0611-Add-BlockBreakBlockEvent.patch} | 0 ...revent-NBT-copy-in-smithing-recipes.patch} | 0 ...patch => 0613-More-CommandBlock-API.patch} | 0 ...-missing-team-sidebar-display-slots.patch} | 0 ...0615-Add-back-EntityPortalExitEvent.patch} | 2 +- ...-find-targets-for-lightning-strikes.patch} | 0 ... 0617-Get-entity-default-attributes.patch} | 0 ...d-API.patch => 0618-Left-handed-API.patch} | 0 ...ch => 0619-Add-more-advancement-API.patch} | 0 ...620-Add-ItemFactory-getSpawnEgg-API.patch} | 0 ...tch => 0621-Add-critical-damage-API.patch} | 0 ...0622-Fix-issues-with-mob-conversion.patch} | 0 ...ollidable-methods-to-various-places.patch} | 0 ...-ram-API.patch => 0624-Goat-ram-API.patch} | 0 ...dd-API-for-resetting-a-single-score.patch} | 0 ...6-Add-Raw-Byte-Entity-Serialization.patch} | 4 +- ...27-Vanilla-command-permission-fixes.patch} | 0 ...logic-for-inventories-on-chunk-unlo.patch} | 0 ...29-Fix-GameProfileCache-concurrency.patch} | 0 ...630-Improve-and-expand-AsyncCatcher.patch} | 2 +- ...per-mobcaps-and-paper-playermobcaps.patch} | 0 ...tize-ResourceLocation-error-logging.patch} | 0 ...lly-inline-methods-in-BlockPosition.patch} | 0 ...ler-threads-according-to-the-plugin.patch} | 0 ...-getChunkAt-has-inlined-logic-for-l.patch} | 0 ...our-chunk-data-off-disk-when-conver.patch} | 0 ...d-state-when-raytracing-skip-air-bl.patch} | 0 ...atch => 0638-Time-scoreboard-search.patch} | 0 ...rimise-map-impl-for-tracked-players.patch} | 0 ...h => 0640-Add-missing-InventoryType.patch} | 0 ...imise-BlockSoil-nearby-water-lookup.patch} | 0 ...ntory-not-closing-on-entity-removal.patch} | 0 ...rement-before-suggesting-root-nodes.patch} | 0 ...ServerboundCommandSuggestionPacket-.patch} | 0 ...h => 0645-Add-packet-limiter-config.patch} | 0 ...nColor-on-tropical-fish-bucket-meta.patch} | 0 ...=> 0647-Ensure-valid-vehicle-status.patch} | 0 ...ftlocked-end-exit-portal-generation.patch} | 0 ...r-causing-a-crash-when-trying-to-ge.patch} | 0 ...-t-log-debug-logging-being-disabled.patch} | 0 ...ous-menus-with-empty-level-accesses.patch} | 0 ...h => 0652-Preserve-overstacked-loot.patch} | 0 ...ate-head-rotation-in-missing-places.patch} | 2 +- ...unintended-light-block-manipulation.patch} | 0 ...0655-Fix-CraftCriteria-defaults-map.patch} | 0 ...Fix-upstreams-block-state-factories.patch} | 2 +- ... => 0657-Configurable-feature-seeds.patch} | 0 ... 0658-Add-root-admin-user-detection.patch} | 0 ...ays-allow-item-changing-in-Fireball.patch} | 0 ...t-attempt-to-teleport-dead-entities.patch} | 2 +- ...ive-velocity-through-repeated-crits.patch} | 0 ...e-code-using-deprecated-for-removal.patch} | 0 ...emoving-recipes-from-RecipeIterator.patch} | 0 ...versized-item-data-in-equipment-and.patch} | 0 ...e-unnecessary-itemmeta-from-clients.patch} | 0 ...=> 0666-Fix-Spigot-growth-modifiers.patch} | 0 ...OpenersCounter-openCount-from-going.patch} | 0 ...0668-Add-PlayerItemFrameChangeEvent.patch} | 2 +- ...tch => 0669-Optimize-HashMapPalette.patch} | 0 ...low-delegation-to-vanilla-chunk-gen.patch} | 0 ...-isSectionEmpty-int-and-optimize-Pa.patch} | 0 ...patch => 0672-Add-more-Campfire-API.patch} | 0 ...data-to-disk-if-it-serializes-witho.patch} | 0 ...ard-CraftEntity-in-teleport-command.patch} | 2 +- ... => 0675-Improve-scoreboard-entries.patch} | 0 ...ch => 0676-Entity-powdered-snow-API.patch} | 4 +- ...0677-Add-API-for-item-entity-health.patch} | 0 ...ax-block-light-for-monster-spawning.patch} | 0 ...pistons-and-BlockPistonRetractEvent.patch} | 0 ...plifiers-greater-than-127-correctly.patch} | 0 ...-canSmelt-methods-to-FurnaceInvento.patch} | 0 ...=> 0682-Fix-bees-aging-inside-hives.patch} | 0 ...le-API.patch => 0683-Bucketable-API.patch} | 0 ...es.patch => 0684-Validate-usernames.patch} | 0 ...er-animal-spawn-height-configurable.patch} | 0 ...anilla-BiomeProvider-from-WorldInfo.patch} | 0 ...ion-for-worlds-affected-by-time-cmd.patch} | 0 ...heck-for-PersistentDataContainer-ha.patch} | 0 ...9-Multiple-Entries-with-Scoreboards.patch} | 0 ...690-Reset-placed-block-on-exception.patch} | 0 ...configurable-height-for-slime-spawn.patch} | 0 ...0692-Fix-xp-reward-for-baby-zombies.patch} | 0 ...lti-Block-Change-API-Implementation.patch} | 0 ...ent.patch => 0694-Fix-NotePlayEvent.patch} | 0 ....patch => 0695-Freeze-Tick-Lock-API.patch} | 4 +- ...h => 0696-More-PotionEffectType-API.patch} | 0 ...for-StructureTemplate.Pallete-cache.patch} | 0 ...command-sender-which-forwards-feedb.patch} | 0 ...-missing-structure-set-seed-configs.patch} | 0 ...h => 0700-Implement-regenerateChunk.patch} | 0 ...lled-powdered-snow-bucket-placement.patch} | 0 ...ate-calls-to-CraftServer-getSpawnLi.patch} | 0 ...gs.patch => 0703-Add-GameEvent-tags.patch} | 0 ...ks-fairly-for-worlds-while-waiting-.patch} | 0 ...tch => 0705-Furnace-RecipesUsed-API.patch} | 0 ...gurable-sculk-sensor-listener-range.patch} | 0 ...d-missing-block-data-mins-and-maxes.patch} | 0 ...fault-CustomSpawners-in-custom-worl.patch} | 0 ...-worldlist-before-initing-the-world.patch} | 0 ... => 0710-Fix-Entity-Position-Desync.patch} | 0 ...s.patch => 0711-Custom-Potion-Mixes.patch} | 0 ...12-Force-close-world-loading-screen.patch} | 0 ...713-Fix-falling-block-spawn-methods.patch} | 0 ...Expose-furnace-minecart-push-values.patch} | 0 ...ojectileHitEvent-for-piercing-arrow.patch} | 0 ...I.patch => 0716-More-Projectile-API.patch} | 20 ++++++--- ...x-swamp-hut-cat-generation-deadlock.patch} | 0 ...le-movement-from-players-while-tele.patch} | 0 ...0719-Implement-getComputedBiome-API.patch} | 0 ...> 0720-Make-some-itemstacks-nonnull.patch} | 0 ...721-Implement-enchantWithLevels-API.patch} | 0 ...h => 0722-Fix-saving-in-unloadWorld.patch} | 0 ...h => 0723-Buffer-OOB-setBlock-calls.patch} | 0 ... 0724-Add-TameableDeathMessageEvent.patch} | 0 ...ock-data-for-EntityChangeBlockEvent.patch} | 0 ...bles-running-when-mob-loot-gamerule.patch} | 0 ...ssenger-world-matches-ridden-entity.patch} | 2 +- ...s.patch => 0728-cache-resource-keys.patch} | 0 ...low-changing-the-EnderDragon-podium.patch} | 0 ...erriding-a-block-entity-during-worl.patch} | 0 ...t-tile-entity-copies-loading-chunks.patch} | 0 ...ead-of-display-name-in-PlayerList-g.patch} | 0 ...> 0733-Expand-PlayerItemDamageEvent.patch} | 0 ...> 0734-WorldCreator-keepSpawnLoaded.patch} | 0 ...-in-CraftPersistentDataTypeRegistry.patch} | 0 ...destroyed-trigger-in-the-correct-pl.patch} | 0 ...Event-and-CollarColorable-interface.patch} | 0 ...CauldronLevelChange-on-initial-fill.patch} | 0 ...snow-cauldrons-not-turning-to-water.patch} | 0 ...> 0740-Add-PlayerStopUsingItemEvent.patch} | 0 ...rs.patch => 0741-Don-t-tick-markers.patch} | 0 ...tch => 0742-Expand-FallingBlock-API.patch} | 0 ...0743-Add-support-for-Proxy-Protocol.patch} | 0 ...x-OfflinePlayer-getBedSpawnLocation.patch} | 0 ...tory-for-smokers-and-blast-furnaces.patch} | 0 ...-read-and-store-sus-effect-duration.patch} | 0 ... 0747-Sanitize-sent-BlockEntity-NBT.patch} | 0 ...-selector-resolving-in-books-by-def.patch} | 0 ...ntity-loading-causing-async-lookups.patch} | 2 +- ...-on-world-create-while-being-ticked.patch} | 0 ...51-Dont-resent-entity-on-art-update.patch} | 0 ... => 0752-Add-WardenAngerChangeEvent.patch} | 0 ...strict-advancement-dimension-checks.patch} | 0 ...tant-BlockStateListPopulator-method.patch} | 0 ...I.patch => 0755-Nameable-Banner-API.patch} | 0 ...roadcast-messages-to-command-blocks.patch} | 0 ...pty-items-from-being-added-to-world.patch} | 0 ...hPotion-and-LingeringPotion-spawnin.patch} | 0 ...atch => 0759-Add-Player-getFishHook.patch} | 0 ...chunk-for-dynamic-game-event-listen.patch} | 0 ...s-missing-EntityDropItemEvent-calls.patch} | 2 +- ...PE.patch => 0762-Fix-Bee-flower-NPE.patch} | 0 ...-not-using-commands.spam-exclusions.patch} | 0 ...API.patch => 0764-More-Teleport-API.patch} | 2 +- ... => 0765-Add-EntityPortalReadyEvent.patch} | 2 +- ...level-random-in-entity-constructors.patch} | 0 ...k-entities-after-destroy-prediction.patch} | 0 ...on-plugins-accessing-faraway-chunks.patch} | 0 ...tom-Chat-Completion-Suggestions-API.patch} | 0 ...Add-and-fix-missing-BlockFadeEvents.patch} | 0 ...ion-API.patch => 0771-Collision-API.patch} | 8 ++-- ...nd-message-for-brigadier-syntax-exc.patch} | 0 ...API.patch => 0773-Block-Ticking-API.patch} | 0 ...-Add-Velocity-IP-Forwarding-Support.patch} | 0 ...775-Add-NamespacedKey-biome-methods.patch} | 0 ...x-plugin-loggers-on-server-shutdown.patch} | 2 +- ...ok-changes-from-crashing-the-server.patch} | 0 ...tityChangeBlockEvent-in-more-places.patch} | 0 ...> 0779-Missing-eating-regain-reason.patch} | 0 ....patch => 0780-Missing-effect-cause.patch} | 0 ...serialization-deserialization-for-P.patch} | 0 ...rameter-to-ProjectileSource-launchP.patch} | 2 +- ...3-Call-BlockPhysicsEvent-more-often.patch} | 0 ...0784-Configurable-chat-thread-limit.patch} | 0 ...of-WorldCreator-keepSpawnLoaded-ret.patch} | 0 ... 0786-fix-Jigsaw-block-kicking-user.patch} | 0 ...mEvent-for-mud-converting-into-clay.patch} | 0 ... => 0788-Add-getDrops-to-BlockState.patch} | 0 ...=> 0789-Fix-a-bunch-of-vanilla-bugs.patch} | 2 +- ...y-onTrackingStart-during-navigation.patch} | 0 ... 0791-Fix-custom-piglin-loved-items.patch} | 0 ...=> 0792-EntityPickupItemEvent-fixes.patch} | 0 ...interactions-with-items-on-cooldown.patch} | 0 ...-Add-PlayerInventorySlotChangeEvent.patch} | 0 ... 0795-Elder-Guardian-appearance-API.patch} | 0 ...ow-changing-bed-s-occupied-property.patch} | 0 ...ch => 0797-Add-entity-knockback-API.patch} | 0 ....patch => 0798-Detect-headless-JREs.patch} | 0 ...-vehicle-collision-event-not-called.patch} | 0 ...ch => 0800-Add-EntityToggleSitEvent.patch} | 0 ... => 0801-Add-fire-tick-delay-option.patch} | 0 ...patch => 0802-Add-Moving-Piston-API.patch} | 0 ...> 0803-Ignore-impossible-spawn-tick.patch} | 0 ...source-for-fireworks-from-dispenser.patch} | 0 ...t-suggestion-permissions-to-align-w.patch} | 0 ...Event-cancellation-cant-fully-preve.patch} | 2 +- ...0807-Add-PrePlayerAttackEntityEvent.patch} | 0 ...e-reset-EnderDragon-boss-event-name.patch} | 0 ...-green-map-markers-do-not-disappear.patch} | 2 +- ... 0810-Add-Player-Warden-Warning-API.patch} | 0 ...a-friendly-methods-to-update-trades.patch} | 0 ...812-Add-paper-dumplisteners-command.patch} | 0 ...lobal-player-list-where-appropriate.patch} | 0 ...sync-entity-add-due-to-fungus-trees.patch} | 0 ....patch => 0815-ItemStack-damage-API.patch} | 0 ...tion-API.patch => 0816-Friction-API.patch} | 0 ...trol-player-s-insomnia-and-phantoms.patch} | 0 ...=> 0818-Fix-player-kick-on-shutdown.patch} | 0 ... => 0819-Sync-offhand-slot-in-menus.patch} | 0 ... 0820-Player-Entity-Tracking-Events.patch} | 2 +- ...tch => 0821-Limit-pet-look-distance.patch} | 0 ...nd-additions-to-the-SpawnReason-API.patch} | 0 ...ments.patch => 0823-fix-Instruments.patch} | 0 ...for-some-hot-BlockBehavior-and-Flui.patch} | 0 ...es-in-dispense-events-regarding-sta.patch} | 0 ...tch => 0826-Add-BlockLockCheckEvent.patch} | 0 ... 0827-Add-Sneaking-API-for-Entities.patch} | 2 +- ... => 0828-Improve-logging-and-errors.patch} | 0 ....patch => 0829-Improve-PortalEvents.patch} | 2 +- ...ion-for-spider-worldborder-climbing.patch} | 0 ...sing-SpigotConfig-logCommands-check.patch} | 0 ...Allay-stopDancing-while-not-dancing.patch} | 0 ...ge.patch => 0833-Flying-Fall-Damage.patch} | 0 ...k-state-to-BlockExplodeEvent-and-En.patch} | 0 ...ion-moving-velocity-to-VehicleBlock.patch} | 2 +- ...onfig-for-disabling-entity-tag-tags.patch} | 0 ...e-player-info-update-packet-on-join.patch} | 0 ...k-items-during-EntityResurrectEvent.patch} | 0 ...en-API.patch => 0839-Win-Screen-API.patch} | 0 ...ItemStack-setAmount-null-assignment.patch} | 0 ...ix-force-opening-enchantment-tables.patch} | 0 ...tch => 0842-Add-Entity-Body-Yaw-API.patch} | 4 +- ...vent-sleeping-villagers-moving-towa.patch} | 0 ...hen-a-captured-block-state-is-outda.patch} | 0 ...=> 0845-Add-EntityFertilizeEggEvent.patch} | 0 ...ty-drop-not-updating-the-client-inv.patch} | 0 ...temEvent-and-EntityCompostItemEvent.patch} | 0 ...ctly-handle-ArmorStand-invisibility.patch} | 0 ...ancement-triggers-for-entity-damage.patch} | 0 ...850-Fix-text-display-error-on-spawn.patch} | 0 ...nventories-returning-null-Locations.patch} | 0 ...API.patch => 0852-Add-Shearable-API.patch} | 0 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} | 0 ...g-to-bad-recipes-in-furnace-like-ti.patch} | 0 ...ence-violations-like-they-should-be.patch} | 0 ...uplicate-animate-packet-for-records.patch} | 0 ...xpired-keys-from-impacting-new-join.patch} | 0 ...ts-being-fired-from-unloaded-chunks.patch} | 0 ...0859-Use-array-for-gamerule-storage.patch} | 0 ...Fix-a-couple-of-upstream-bed-issues.patch} | 0 ...ix-demo-flag-not-enabling-demo-mode.patch} | 0 ... 0862-Add-Mob-Experience-reward-API.patch} | 0 ...redstone-on-top-of-trap-doors-early.patch} | 0 ...Lazy-Initialization-for-Enum-Fields.patch} | 0 ...65-More-accurate-isInOpenWater-impl.patch} | 0 ...ccess-to-lookups-field-in-RegistryO.patch} | 0 ... => 0867-Expand-PlayerItemMendEvent.patch} | 0 ...sh-ProjectileSource-for-projectiles.patch} | 2 +- ... => 0869-Add-transient-modifier-API.patch} | 0 ...patch => 0870-Fix-block-place-logic.patch} | 0 ...nd-playing-for-BlockItem-ItemStacks.patch} | 0 ...l-BlockGrowEvent-for-missing-blocks.patch} | 0 ...nhasbukkit-default-if-alias-block-e.patch} | 0 ...pLike-spam-for-missing-key-selector.patch} | 0 ...-Fix-sniffer-removeExploredLocation.patch} | 0 ...to-remove-all-active-potion-effects.patch} | 2 +- ...rafting-result-amount-for-fireworks.patch} | 0 ...8-Add-event-for-player-editing-sign.patch} | 0 ...k-item-frames-if-players-can-see-it.patch} | 0 ...ermission-levels-for-command-blocks.patch} | 0 ...Add-option-to-disable-block-updates.patch} | 0 ...882-Call-missing-BlockDispenseEvent.patch} | 0 ...-chunks-for-supporting-block-checks.patch} | 2 +- ...Optimize-player-lookups-for-beacons.patch} | 0 ...885-Add-Sign-getInteractableSideFor.patch} | 0 ...86-Array-backed-synched-entity-data.patch} | 0 ...7-fix-item-meta-for-tadpole-buckets.patch} | 0 ...t-API.patch => 0888-Fix-BanList-API.patch} | 0 ...d-water-fluid-explosion-resistance-.patch} | 0 ...x-possible-NPE-on-painting-creation.patch} | 0 ...imer-for-Wandering-Traders-spawned-.patch} | 0 ...nceOrb-should-call-EntitySpawnEvent.patch} | 0 ...t-throw-both-Spread-and-Grow-Events.patch} | 0 ....patch => 0894-Add-whitelist-events.patch} | 0 ... 0895-Implement-PlayerFailMoveEvent.patch} | 0 ...olia-scheduler-and-owned-region-API.patch} | 4 +- ...se-allay-memory-on-non-item-targets.patch} | 0 ...API-for-updating-recipes-on-clients.patch} | 0 ...tion-when-spawning-display-entities.patch} | 0 ...900-Only-capture-actual-tree-growth.patch} | 0 ...rce-for-mushroom-block-spread-event.patch} | 0 ...Data-on-more-entities-when-spawning.patch} | 0 ...-Use-correct-seed-on-api-world-load.patch} | 0 ...ta-neighbour-ticks-outside-of-range.patch} | 0 ...> 0905-Cache-map-ids-on-item-frames.patch} | 2 +- ...-custom-statistic-criteria-creation.patch} | 0 ...atch => 0907-Bandaid-fix-for-Effect.patch} | 0 ...tch => 0908-SculkCatalyst-bloom-API.patch} | 0 ...API-for-an-entity-s-scoreboard-name.patch} | 4 +- ...lace-methods-with-old-StructureType.patch} | 0 ...e-namespaced-commands-if-send-names.patch} | 0 ...-handle-BlockBreakEvent-isDropItems.patch} | 0 ...entity-death-event-for-ender-dragon.patch} | 0 ...tity-tracking-range-by-Y-coordinate.patch} | 0 ... => 0915-Add-Listing-API-for-Player.patch} | 0 ...figurable-Region-Compression-Format.patch} | 0 ...7-Add-BlockFace-to-BlockDamageEvent.patch} | 0 ...h => 0918-Fix-NPE-on-Boat-getStatus.patch} | 0 ...e-API.patch => 0919-Expand-Pose-API.patch} | 4 +- ...patch => 0920-More-DragonBattle-API.patch} | 0 ... 0921-Deep-clone-unhandled-nbt-tags.patch} | 0 ...tch => 0922-Add-PlayerPickItemEvent.patch} | 0 ...=> 0923-Allow-trident-custom-damage.patch} | 0 ...4-Expose-hand-in-BlockCanBuildEvent.patch} | 0 ...-nearest-structure-border-iteration.patch} | 0 ...Implement-OfflinePlayer-isConnected.patch} | 0 ....patch => 0927-Fix-inventory-desync.patch} | 0 ...titleOverride-to-InventoryOpenEvent.patch} | 0 ...29-Configure-sniffer-egg-hatch-time.patch} | 0 ...-proximity-check-before-entity-look.patch} | 0 ...kip-POI-finding-if-stuck-in-vehicle.patch} | 0 ...t-sanity-checks-in-container-clicks.patch} | 0 ...ll-BlockRedstoneEvents-for-lecterns.patch} | 0 ...roper-checking-of-empty-item-stacks.patch} | 0 ...ix-silent-equipment-change-for-mobs.patch} | 0 ...h => 0936-Fix-spigot-s-Forced-Stats.patch} | 0 ...ing-InventoryHolders-to-inventories.patch} | 0 ...entities-in-chunks-that-are-positio.patch} | 0 ...sing-logs-for-log-ips-config-option.patch} | 0 ...Remove-Spigot-Bug-Fix-for-MC-109346.patch} | 0 ...n-on-UpgradeData.BlockFixers-class-.patch} | 0 ...-AdvancementProgress-getDateAwarded.patch} | 0 ...idebar-objectives-not-being-cleared.patch} | 0 ...x-missing-map-initialize-event-call.patch} | 0 ...a-when-attaching-firework-to-entity.patch} | 0 ...ble-for-initializing-CraftLootTable.patch} | 0 ...47-Fix-UnsafeValues-loadAdvancement.patch} | 0 ...> 0948-Add-player-idle-duration-API.patch} | 0 ...-if-we-can-see-non-visible-entities.patch} | 0 ...NPE-in-SculkBloomEvent-world-access.patch} | 0 ...tack-for-Player-sendEquipmentChange.patch} | 0 ...Ints.patch => 0952-Optimize-VarInts.patch} | 0 ...e-collision-shape-of-a-block-before.patch} | 0 ...redicate-for-blocks-when-raytracing.patch} | 0 ...em-packets-with-collector-as-source.patch} | 0 ... => 0956-Expand-LingeringPotion-API.patch} | 0 ....patch => 0957-Add-MaterialTagsTest.patch} | 0 ...ngEffect-powers-lightning-rods-and-.patch} | 0 ...h-event-for-all-player-interactions.patch} | 0 ...everal-issues-with-EntityBreedEvent.patch} | 0 ...961-Add-UUID-attribute-modifier-API.patch} | 0 ...-event-call-for-entity-teleport-API.patch} | 2 +- ...y-create-LootContext-for-criterions.patch} | 0 ...-t-fire-sync-events-during-worldgen.patch} | 2 +- ...tch => 0965-Add-Structure-check-API.patch} | 0 ...-getAttributeModifier-duplication-c.patch} | 0 ...store-vanilla-entity-drops-behavior.patch} | 2 +- ...-Dont-resend-blocks-on-interactions.patch} | 0 ...tch => 0969-add-more-scoreboard-API.patch} | 0 ...stry.patch => 0970-Improve-Registry.patch} | 0 ...on-null-loc-for-EntityTeleportEvent.patch} | 0 ...h => 0972-Add-experience-points-API.patch} | 0 ...h => 0973-Add-drops-to-shear-events.patch} | 0 ...> 0974-Add-PlayerShieldDisableEvent.patch} | 0 ...ate-ResourceLocation-in-NBT-reading.patch} | 0 ...-experience-dropping-on-block-break.patch} | 0 ...> 0977-Fixup-NamespacedKey-handling.patch} | 0 ...78-Expose-LootTable-of-DecoratedPot.patch} | 0 ...location-of-Vec3D-by-entity-tracker.patch} | 0 ...> 0980-Rewrite-dataconverter-system.patch} | 0 ...2-Starlight.patch => 0981-Starlight.patch} | 0 ....patch => 0982-Rewrite-chunk-system.patch} | 2 +- ...incremental-chunk-and-player-saving.patch} | 0 ...dBounds-and-getBlockState-for-inlin.patch} | 0 ...tem-frames-performance-and-bug-fixe.patch} | 0 ...ing-for-EntityLiving-hasLineOfSight.patch} | 0 ...Manager-and-add-advanced-packet-sup.patch} | 0 ...88-Allow-Saving-of-Oversized-Chunks.patch} | 0 ...89-Fix-World-isChunkGenerated-calls.patch} | 0 ...990-Flat-bedrock-generator-settings.patch} | 0 ...=> 0991-Entity-Activation-Range-2.0.patch} | 2 +- ...0992-Optional-per-player-mob-spawns.patch} | 0 ...4-Anti-Xray.patch => 0993-Anti-Xray.patch} | 0 ...g-PreCreatureSpawnEvent-with-per-pl.patch} | 0 ...timize-Collision-to-not-load-chunks.patch} | 2 +- ...alSelector-Goal.Flag-Set-operations.patch} | 0 ...97-Entity-load-save-limit-per-chunk.patch} | 0 ...-and-optimise-world-force-upgrading.patch} | 0 ...h => 0999-Improved-Watchdog-Support.patch} | 0 ...> 1000-Optimize-Voxel-Shape-Merging.patch} | 0 ...ch => 1001-Write-SavedData-IO-async.patch} | 0 ...nd-End-Portal-Frames-from-being-des.patch} | 0 ...ance-map-to-optimise-entity-tracker.patch} | 2 +- ...Optimize-Bit-Operations-by-inlining.patch} | 0 ...> 1005-Remove-streams-from-hot-code.patch} | 0 ...-Eigencraft-redstone-implementation.patch} | 0 ...er-Remove-Streams-Optimized-collect.patch} | 0 ...rTradeEvent-and-PlayerPurchaseEvent.patch} | 0 ...-Improve-boat-collision-performance.patch} | 0 ...=> 1010-Optimise-general-POI-access.patch} | 0 ...ementation-for-blockstate-state-loo.patch} | 0 ...> 1012-Execute-chunk-tasks-mid-tick.patch} | 0 ... 1013-Optimise-random-block-ticking.patch} | 0 ...ulate-regionfile-header-if-it-is-co.patch} | 0 ...city-compression-and-cipher-natives.patch} | 0 ...-more-information-in-watchdog-dumps.patch} | 2 +- ...tch => 1017-Collision-optimisations.patch} | 2 +- ...n-checking-in-player-move-packet-ha.patch} | 0 ...e-disarming-not-working-as-intended.patch} | 0 ...-type-tags-suggestions-in-selectors.patch} | 0 ...ate-Current-redstone-implementation.patch} | 0 ...22-optimize-dirt-and-snow-spreading.patch} | 0 ...ch => 1023-Properly-resend-entities.patch} | 2 +- ...pers.patch => 1024-Optimize-Hoppers.patch} | 0 ...-Improve-performance-of-mass-crafts.patch} | 0 ...> 1026-Actually-optimise-explosions.patch} | 0 ... 1027-Optimise-chunk-tick-iteration.patch} | 0 ...atch => 1028-Lag-compensation-ticks.patch} | 0 ...29-Optimise-nearby-player-retrieval.patch} | 0 ... 1030-Distance-manager-tick-timings.patch} | 0 ...-Oversized-block-entities-in-chunks.patch} | 0 ...packets-for-hard-colliding-entities.patch} | 0 ...h => 1033-Add-ShulkerDuplicateEvent.patch} | 0 ...dd-api-for-spawn-egg-texture-colors.patch} | 0 ...5-Disable-memory-reserve-allocating.patch} | 0 ...=> 1036-Improve-tag-parser-handling.patch} | 0 ... => 1037-Add-Lifecycle-Event-system.patch} | 0 ...nduit-API.patch => 1038-Conduit-API.patch} | 0 ...patch => 1039-ItemStack-Tooltip-API.patch} | 0 ...ackOverflowError-for-some-dispenses.patch} | 0 ...e-changed-item-from-dispense-events.patch} | 0 ...Snapshot-includeLightData-parameter.patch} | 0 ...PI.patch => 1043-Add-FluidState-API.patch} | 0 ...patch => 1044-add-number-format-api.patch} | 0 ...eck-if-itemstack-is-stackable-first.patch} | 0 ...ByEntityEvent-for-unowned-wither-sk.patch} | 0 ...patch => 1047-improve-BanList-types.patch} | 0 ...-Configurable-max-block-fluid-ticks.patch} | 0 ...49-disable-forced-empty-world-ticks.patch} | 0 ...=> 1050-Suspicious-Effect-Entry-API.patch} | 0 ...-Per-world-ticks-per-spawn-settings.patch} | 0 ...ng-message-for-initial-server-start.patch} | 0 ....patch => 1053-Fix-DamageSource-API.patch} | 2 +- ...I.patch => 1054-Expanded-Hopper-API.patch} | 0 939 files changed, 171 insertions(+), 211 deletions(-) rename patches/api/{0202-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0201-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%) delete mode 100644 patches/api/0201-Improve-Arrow-API.patch rename patches/api/{0203-Support-components-in-ItemMeta.patch => 0202-Support-components-in-ItemMeta.patch} (96%) rename patches/api/{0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch => 0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch} (100%) rename patches/api/{0205-Add-entity-liquid-API.patch => 0204-Add-entity-liquid-API.patch} (100%) rename patches/api/{0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch => 0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch} (100%) rename patches/api/{0207-Add-BellRingEvent.patch => 0206-Add-BellRingEvent.patch} (100%) rename patches/api/{0208-Brand-support.patch => 0207-Brand-support.patch} (100%) rename patches/api/{0209-Add-moon-phase-API.patch => 0208-Add-moon-phase-API.patch} (100%) rename patches/api/{0210-Add-playPickupItemAnimation-to-LivingEntity.patch => 0209-Add-playPickupItemAnimation-to-LivingEntity.patch} (93%) rename patches/api/{0211-Add-more-Evoker-API.patch => 0210-Add-more-Evoker-API.patch} (100%) rename patches/api/{0212-Add-methods-to-get-translation-keys.patch => 0211-Add-methods-to-get-translation-keys.patch} (99%) rename patches/api/{0213-Create-HoverEvent-from-ItemStack-Entity.patch => 0212-Create-HoverEvent-from-ItemStack-Entity.patch} (100%) rename patches/api/{0214-Add-additional-open-container-api-to-HumanEntity.patch => 0213-Add-additional-open-container-api-to-HumanEntity.patch} (100%) rename patches/api/{0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%) rename patches/api/{0216-Entity-isTicking.patch => 0215-Entity-isTicking.patch} (100%) rename patches/api/{0217-Villager-resetOffers.patch => 0216-Villager-resetOffers.patch} (100%) rename patches/api/{0218-Player-elytra-boost-API.patch => 0217-Player-elytra-boost-API.patch} (100%) rename patches/api/{0219-Add-getOfflinePlayerIfCached-String.patch => 0218-Add-getOfflinePlayerIfCached-String.patch} (100%) rename patches/api/{0220-Add-ignore-discounts-API.patch => 0219-Add-ignore-discounts-API.patch} (100%) rename patches/api/{0221-Item-no-age-no-player-pickup.patch => 0220-Item-no-age-no-player-pickup.patch} (93%) rename patches/api/{0222-Beacon-API-custom-effect-ranges.patch => 0221-Beacon-API-custom-effect-ranges.patch} (100%) rename patches/api/{0223-Add-API-for-quit-reason.patch => 0222-Add-API-for-quit-reason.patch} (100%) rename patches/api/{0224-Add-Destroy-Speed-API.patch => 0223-Add-Destroy-Speed-API.patch} (97%) rename patches/api/{0225-Add-LivingEntity-clearActiveItem.patch => 0224-Add-LivingEntity-clearActiveItem.patch} (90%) rename patches/api/{0226-Add-PlayerItemCooldownEvent.patch => 0225-Add-PlayerItemCooldownEvent.patch} (100%) rename patches/api/{0227-More-lightning-API.patch => 0226-More-lightning-API.patch} (100%) rename patches/api/{0228-Add-PlayerShearBlockEvent.patch => 0227-Add-PlayerShearBlockEvent.patch} (100%) rename patches/api/{0229-Player-Chunk-Load-Unload-Events.patch => 0228-Player-Chunk-Load-Unload-Events.patch} (100%) rename patches/api/{0230-Expose-LivingEntity-hurt-direction.patch => 0229-Expose-LivingEntity-hurt-direction.patch} (95%) rename patches/api/{0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%) rename patches/api/{0232-Added-PlayerTradeEvent.patch => 0231-Added-PlayerTradeEvent.patch} (100%) rename patches/api/{0233-Add-TargetHitEvent-API.patch => 0232-Add-TargetHitEvent-API.patch} (100%) rename patches/api/{0234-Additional-Block-Material-API-s.patch => 0233-Additional-Block-Material-API-s.patch} (95%) rename patches/api/{0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch => 0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%) rename patches/api/{0236-Add-PlayerFlowerPotManipulateEvent.patch => 0235-Add-PlayerFlowerPotManipulateEvent.patch} (100%) rename patches/api/{0237-Zombie-API-breaking-doors.patch => 0236-Zombie-API-breaking-doors.patch} (100%) rename patches/api/{0238-Add-EntityLoadCrossbowEvent.patch => 0237-Add-EntityLoadCrossbowEvent.patch} (100%) rename patches/api/{0239-Added-WorldGameRuleChangeEvent.patch => 0238-Added-WorldGameRuleChangeEvent.patch} (100%) rename patches/api/{0240-Added-ServerResourcesReloadedEvent.patch => 0239-Added-ServerResourcesReloadedEvent.patch} (100%) rename patches/api/{0241-Add-BlockFailedDispenseEvent.patch => 0240-Add-BlockFailedDispenseEvent.patch} (100%) rename patches/api/{0242-Added-PlayerLecternPageChangeEvent.patch => 0241-Added-PlayerLecternPageChangeEvent.patch} (100%) rename patches/api/{0243-Added-PlayerLoomPatternSelectEvent.patch => 0242-Added-PlayerLoomPatternSelectEvent.patch} (100%) rename patches/api/{0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch => 0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch} (100%) rename patches/api/{0245-Add-sendOpLevel-API.patch => 0244-Add-sendOpLevel-API.patch} (100%) rename patches/api/{0246-Add-PaperRegistry.patch => 0245-Add-PaperRegistry.patch} (100%) rename patches/api/{0247-Add-StructuresLocateEvent.patch => 0246-Add-StructuresLocateEvent.patch} (100%) rename patches/api/{0248-Add-BlockPreDispenseEvent.patch => 0247-Add-BlockPreDispenseEvent.patch} (100%) rename patches/api/{0249-Added-PlayerChangeBeaconEffectEvent.patch => 0248-Added-PlayerChangeBeaconEffectEvent.patch} (100%) rename patches/api/{0250-Added-PlayerStonecutterRecipeSelectEvent.patch => 0249-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%) rename patches/api/{0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%) rename patches/api/{0252-add-DragonEggFormEvent.patch => 0251-add-DragonEggFormEvent.patch} (100%) rename patches/api/{0253-EntityMoveEvent.patch => 0252-EntityMoveEvent.patch} (100%) rename patches/api/{0254-Allow-adding-items-to-BlockDropItemEvent.patch => 0253-Allow-adding-items-to-BlockDropItemEvent.patch} (100%) rename patches/api/{0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%) rename patches/api/{0256-living-entity-allow-attribute-registration.patch => 0255-living-entity-allow-attribute-registration.patch} (100%) rename patches/api/{0257-Add-missing-effects.patch => 0256-Add-missing-effects.patch} (100%) rename patches/api/{0258-Expose-Tracked-Players.patch => 0257-Expose-Tracked-Players.patch} (100%) rename patches/api/{0259-Cache-the-result-of-Material-isBlock.patch => 0258-Cache-the-result-of-Material-isBlock.patch} (100%) rename patches/api/{0260-Add-worldborder-events.patch => 0259-Add-worldborder-events.patch} (100%) rename patches/api/{0261-added-PlayerNameEntityEvent.patch => 0260-added-PlayerNameEntityEvent.patch} (100%) rename patches/api/{0262-Add-recipe-to-cook-events.patch => 0261-Add-recipe-to-cook-events.patch} (100%) rename patches/api/{0263-Add-Block-isValidTool.patch => 0262-Add-Block-isValidTool.patch} (100%) rename patches/api/{0264-Expand-world-key-API.patch => 0263-Expand-world-key-API.patch} (100%) rename patches/api/{0265-Item-Rarity-API.patch => 0264-Item-Rarity-API.patch} (100%) rename patches/api/{0266-Expose-protocol-version.patch => 0265-Expose-protocol-version.patch} (100%) rename patches/api/{0267-add-isDeeplySleeping-to-HumanEntity.patch => 0266-add-isDeeplySleeping-to-HumanEntity.patch} (100%) rename patches/api/{0268-add-consumeFuel-to-FurnaceBurnEvent.patch => 0267-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%) rename patches/api/{0269-add-get-set-drop-chance-to-EntityEquipment.patch => 0268-add-get-set-drop-chance-to-EntityEquipment.patch} (100%) rename patches/api/{0270-Added-PlayerDeepSleepEvent.patch => 0269-Added-PlayerDeepSleepEvent.patch} (100%) rename patches/api/{0271-More-World-API.patch => 0270-More-World-API.patch} (100%) rename patches/api/{0272-Added-PlayerBedFailEnterEvent.patch => 0271-Added-PlayerBedFailEnterEvent.patch} (100%) rename patches/api/{0273-Introduce-beacon-activation-deactivation-events.patch => 0272-Introduce-beacon-activation-deactivation-events.patch} (100%) rename patches/api/{0274-PlayerMoveEvent-Improvements.patch => 0273-PlayerMoveEvent-Improvements.patch} (100%) rename patches/api/{0275-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0274-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%) rename patches/api/{0276-Add-more-WanderingTrader-API.patch => 0275-Add-more-WanderingTrader-API.patch} (100%) rename patches/api/{0277-Add-EntityBlockStorage-clearEntities.patch => 0276-Add-EntityBlockStorage-clearEntities.patch} (100%) rename patches/api/{0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%) rename patches/api/{0279-Inventory-close.patch => 0278-Inventory-close.patch} (100%) rename patches/api/{0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%) rename patches/api/{0281-Add-basic-Datapack-API.patch => 0280-Add-basic-Datapack-API.patch} (100%) rename patches/api/{0282-additions-to-PlayerGameModeChangeEvent.patch => 0281-additions-to-PlayerGameModeChangeEvent.patch} (100%) rename patches/api/{0283-ItemStack-repair-check-API.patch => 0282-ItemStack-repair-check-API.patch} (100%) rename patches/api/{0284-More-Enchantment-API.patch => 0283-More-Enchantment-API.patch} (100%) rename patches/api/{0285-Add-Mob-lookAt-API.patch => 0284-Add-Mob-lookAt-API.patch} (100%) rename patches/api/{0286-ItemStack-editMeta.patch => 0285-ItemStack-editMeta.patch} (100%) rename patches/api/{0287-Add-EntityInsideBlockEvent.patch => 0286-Add-EntityInsideBlockEvent.patch} (100%) rename patches/api/{0288-Attributes-API-for-item-defaults.patch => 0287-Attributes-API-for-item-defaults.patch} (100%) rename patches/api/{0289-Add-cause-to-Weather-ThunderChangeEvents.patch => 0288-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%) rename patches/api/{0290-More-Lidded-Block-API.patch => 0289-More-Lidded-Block-API.patch} (100%) rename patches/api/{0291-Add-PlayerKickEvent-causes.patch => 0290-Add-PlayerKickEvent-causes.patch} (97%) rename patches/api/{0292-Add-PufferFishStateChangeEvent.patch => 0291-Add-PufferFishStateChangeEvent.patch} (100%) rename patches/api/{0293-Add-BellRevealRaiderEvent.patch => 0292-Add-BellRevealRaiderEvent.patch} (100%) rename patches/api/{0294-Add-ElderGuardianAppearanceEvent.patch => 0293-Add-ElderGuardianAppearanceEvent.patch} (100%) rename patches/api/{0295-Add-more-line-of-sight-methods.patch => 0294-Add-more-line-of-sight-methods.patch} (100%) rename patches/api/{0296-Add-WaterBottleSplashEvent.patch => 0295-Add-WaterBottleSplashEvent.patch} (100%) rename patches/api/{0297-Add-more-LimitedRegion-API.patch => 0296-Add-more-LimitedRegion-API.patch} (100%) rename patches/api/{0298-Missing-Entity-API.patch => 0297-Missing-Entity-API.patch} (98%) rename patches/api/{0299-Adds-PlayerArmSwingEvent.patch => 0298-Adds-PlayerArmSwingEvent.patch} (100%) rename patches/api/{0300-Add-PlayerSignCommandPreprocessEvent.patch => 0299-Add-PlayerSignCommandPreprocessEvent.patch} (100%) rename patches/api/{0301-fix-empty-array-elements-in-command-arguments.patch => 0300-fix-empty-array-elements-in-command-arguments.patch} (100%) rename patches/api/{0302-Stinger-API.patch => 0301-Stinger-API.patch} (95%) rename patches/api/{0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%) rename patches/api/{0304-Add-PlayerSetSpawnEvent.patch => 0303-Add-PlayerSetSpawnEvent.patch} (100%) rename patches/api/{0305-Added-EntityDamageItemEvent.patch => 0304-Added-EntityDamageItemEvent.patch} (100%) rename patches/api/{0306-Make-EntityUnleashEvent-cancellable.patch => 0305-Make-EntityUnleashEvent-cancellable.patch} (100%) rename patches/api/{0307-Change-EnderEye-target-without-changing-other-things.patch => 0306-Change-EnderEye-target-without-changing-other-things.patch} (100%) rename patches/api/{0308-Add-BlockBreakBlockEvent.patch => 0307-Add-BlockBreakBlockEvent.patch} (100%) rename patches/api/{0309-Add-helpers-for-left-right-click-to-Action.patch => 0308-Add-helpers-for-left-right-click-to-Action.patch} (100%) rename patches/api/{0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%) rename patches/api/{0311-More-CommandBlock-API.patch => 0310-More-CommandBlock-API.patch} (100%) rename patches/api/{0312-Add-missing-team-sidebar-display-slots.patch => 0311-Add-missing-team-sidebar-display-slots.patch} (100%) rename patches/api/{0313-add-back-EntityPortalExitEvent.patch => 0312-add-back-EntityPortalExitEvent.patch} (100%) rename patches/api/{0314-Add-methods-to-find-targets-for-lightning-strikes.patch => 0313-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%) rename patches/api/{0315-Get-entity-default-attributes.patch => 0314-Get-entity-default-attributes.patch} (100%) rename patches/api/{0316-Left-handed-API.patch => 0315-Left-handed-API.patch} (100%) rename patches/api/{0317-Add-critical-damage-API.patch => 0316-Add-critical-damage-API.patch} (100%) rename patches/api/{0318-Add-more-advancement-API.patch => 0317-Add-more-advancement-API.patch} (100%) rename patches/api/{0319-Fix-issues-with-mob-conversion.patch => 0318-Fix-issues-with-mob-conversion.patch} (100%) rename patches/api/{0320-Add-isCollidable-methods-to-various-places.patch => 0319-Add-isCollidable-methods-to-various-places.patch} (100%) rename patches/api/{0321-Goat-ram-API.patch => 0320-Goat-ram-API.patch} (100%) rename patches/api/{0322-Add-API-for-resetting-a-single-score.patch => 0321-Add-API-for-resetting-a-single-score.patch} (100%) rename patches/api/{0323-Add-Raw-Byte-Entity-Serialization.patch => 0322-Add-Raw-Byte-Entity-Serialization.patch} (94%) rename patches/api/{0324-Add-PlayerItemFrameChangeEvent.patch => 0323-Add-PlayerItemFrameChangeEvent.patch} (100%) rename patches/api/{0325-Allow-delegation-to-vanilla-chunk-gen.patch => 0324-Allow-delegation-to-vanilla-chunk-gen.patch} (100%) rename patches/api/{0326-Add-more-Campfire-API.patch => 0325-Add-more-Campfire-API.patch} (100%) rename patches/api/{0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch => 0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch} (100%) rename patches/api/{0328-Improve-scoreboard-entries.patch => 0327-Improve-scoreboard-entries.patch} (100%) rename patches/api/{0329-Entity-powdered-snow-API.patch => 0328-Entity-powdered-snow-API.patch} (90%) rename patches/api/{0330-Add-API-for-item-entity-health.patch => 0329-Add-API-for-item-entity-health.patch} (100%) rename patches/api/{0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%) rename patches/api/{0332-Bucketable-API.patch => 0331-Bucketable-API.patch} (100%) rename patches/api/{0333-System-prop-for-default-config-comment-parsing.patch => 0332-System-prop-for-default-config-comment-parsing.patch} (100%) rename patches/api/{0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%) rename patches/api/{0335-Multiple-Entries-with-Scoreboards.patch => 0334-Multiple-Entries-with-Scoreboards.patch} (100%) rename patches/api/{0336-Warn-on-strange-EventHandler-return-types.patch => 0335-Warn-on-strange-EventHandler-return-types.patch} (100%) rename patches/api/{0337-Multi-Block-Change-API.patch => 0336-Multi-Block-Change-API.patch} (95%) rename patches/api/{0338-Fix-NotePlayEvent.patch => 0337-Fix-NotePlayEvent.patch} (100%) rename patches/api/{0339-Freeze-Tick-Lock-API.patch => 0338-Freeze-Tick-Lock-API.patch} (81%) rename patches/api/{0340-Dolphin-API.patch => 0339-Dolphin-API.patch} (100%) rename patches/api/{0341-More-PotionEffectType-API.patch => 0340-More-PotionEffectType-API.patch} (100%) rename patches/api/{0342-API-for-creating-command-sender-which-forwards-feedb.patch => 0341-API-for-creating-command-sender-which-forwards-feedb.patch} (100%) rename patches/api/{0343-Implement-regenerateChunk.patch => 0342-Implement-regenerateChunk.patch} (100%) rename patches/api/{0344-Add-GameEvent-tags.patch => 0343-Add-GameEvent-tags.patch} (100%) rename patches/api/{0345-Furnace-RecipesUsed-API.patch => 0344-Furnace-RecipesUsed-API.patch} (100%) rename patches/api/{0346-Configurable-sculk-sensor-listener-range.patch => 0345-Configurable-sculk-sensor-listener-range.patch} (100%) rename patches/api/{0347-Add-missing-block-data-mins-and-maxes.patch => 0346-Add-missing-block-data-mins-and-maxes.patch} (100%) rename patches/api/{0348-Custom-Potion-Mixes.patch => 0347-Custom-Potion-Mixes.patch} (100%) rename patches/api/{0349-Expose-furnace-minecart-push-values.patch => 0348-Expose-furnace-minecart-push-values.patch} (100%) rename patches/api/{0350-More-Projectile-API.patch => 0349-More-Projectile-API.patch} (97%) rename patches/api/{0351-Add-getComputedBiome-API.patch => 0350-Add-getComputedBiome-API.patch} (100%) rename patches/api/{0352-Add-enchantWithLevels-API.patch => 0351-Add-enchantWithLevels-API.patch} (100%) rename patches/api/{0353-Add-TameableDeathMessageEvent.patch => 0352-Add-TameableDeathMessageEvent.patch} (100%) rename patches/api/{0354-Allow-to-change-the-podium-of-the-EnderDragon.patch => 0353-Allow-to-change-the-podium-of-the-EnderDragon.patch} (100%) rename patches/api/{0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch => 0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch} (100%) rename patches/api/{0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%) rename patches/api/{0357-WorldCreator-keepSpawnLoaded.patch => 0356-WorldCreator-keepSpawnLoaded.patch} (100%) rename patches/api/{0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%) rename patches/api/{0359-Add-PlayerStopUsingItemEvent.patch => 0358-Add-PlayerStopUsingItemEvent.patch} (100%) rename patches/api/{0360-Expand-FallingBlock-API.patch => 0359-Expand-FallingBlock-API.patch} (100%) rename patches/api/{0361-Add-method-isTickingWorlds-to-Bukkit.patch => 0360-Add-method-isTickingWorlds-to-Bukkit.patch} (100%) rename patches/api/{0362-Add-WardenAngerChangeEvent.patch => 0361-Add-WardenAngerChangeEvent.patch} (100%) rename patches/api/{0363-Nameable-Banner-API.patch => 0362-Nameable-Banner-API.patch} (100%) rename patches/api/{0364-Add-Player-getFishHook.patch => 0363-Add-Player-getFishHook.patch} (100%) rename patches/api/{0365-More-Teleport-API.patch => 0364-More-Teleport-API.patch} (99%) rename patches/api/{0366-Add-EntityPortalReadyEvent.patch => 0365-Add-EntityPortalReadyEvent.patch} (100%) rename patches/api/{0367-Custom-Chat-Completion-Suggestions-API.patch => 0366-Custom-Chat-Completion-Suggestions-API.patch} (100%) rename patches/api/{0368-Collision-API.patch => 0367-Collision-API.patch} (92%) rename patches/api/{0369-Block-Ticking-API.patch => 0368-Block-Ticking-API.patch} (100%) rename patches/api/{0370-Add-NamespacedKey-biome-methods.patch => 0369-Add-NamespacedKey-biome-methods.patch} (100%) rename patches/api/{0371-Also-load-resources-from-LibraryLoader.patch => 0370-Also-load-resources-from-LibraryLoader.patch} (100%) rename patches/api/{0372-Added-byte-array-serialization-deserialization-for-P.patch => 0371-Added-byte-array-serialization-deserialization-for-P.patch} (100%) rename patches/api/{0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%) rename patches/api/{0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch => 0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch} (100%) rename patches/api/{0375-Add-getDrops-to-BlockState.patch => 0374-Add-getDrops-to-BlockState.patch} (100%) rename patches/api/{0376-Add-PlayerInventorySlotChangeEvent.patch => 0375-Add-PlayerInventorySlotChangeEvent.patch} (100%) rename patches/api/{0377-Elder-Guardian-appearance-API.patch => 0376-Elder-Guardian-appearance-API.patch} (100%) rename patches/api/{0378-Allow-changing-bed-s-occupied-property.patch => 0377-Allow-changing-bed-s-occupied-property.patch} (100%) rename patches/api/{0379-Add-EquipmentSlot-convenience-methods.patch => 0378-Add-EquipmentSlot-convenience-methods.patch} (100%) rename patches/api/{0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch => 0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch} (100%) rename patches/api/{0381-Add-entity-knockback-API.patch => 0380-Add-entity-knockback-API.patch} (100%) rename patches/api/{0382-Added-EntityToggleSitEvent.patch => 0381-Added-EntityToggleSitEvent.patch} (100%) rename patches/api/{0383-Add-Moving-Piston-API.patch => 0382-Add-Moving-Piston-API.patch} (100%) rename patches/api/{0384-Add-PrePlayerAttackEntityEvent.patch => 0383-Add-PrePlayerAttackEntityEvent.patch} (100%) rename patches/api/{0385-Add-Player-Warden-Warning-API.patch => 0384-Add-Player-Warden-Warning-API.patch} (100%) rename patches/api/{0386-More-vanilla-friendly-methods-to-update-trades.patch => 0385-More-vanilla-friendly-methods-to-update-trades.patch} (100%) rename patches/api/{0387-Add-paper-dumplisteners-command.patch => 0386-Add-paper-dumplisteners-command.patch} (100%) rename patches/api/{0388-ItemStack-damage-API.patch => 0387-ItemStack-damage-API.patch} (100%) rename patches/api/{0389-Add-Tick-TemporalUnit.patch => 0388-Add-Tick-TemporalUnit.patch} (100%) rename patches/api/{0390-Friction-API.patch => 0389-Friction-API.patch} (96%) rename patches/api/{0391-Player-Entity-Tracking-Events.patch => 0390-Player-Entity-Tracking-Events.patch} (100%) rename patches/api/{0392-Add-missing-Fluid-type.patch => 0391-Add-missing-Fluid-type.patch} (100%) rename patches/api/{0393-fix-Instruments.patch => 0392-fix-Instruments.patch} (100%) rename patches/api/{0394-Add-BlockLockCheckEvent.patch => 0393-Add-BlockLockCheckEvent.patch} (100%) rename patches/api/{0395-Add-Sneaking-API-for-Entities.patch => 0394-Add-Sneaking-API-for-Entities.patch} (91%) rename patches/api/{0396-Improve-PortalEvents.patch => 0395-Improve-PortalEvents.patch} (100%) rename patches/api/{0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%) rename patches/api/{0398-Flying-Fall-Damage-API.patch => 0397-Flying-Fall-Damage-API.patch} (100%) rename patches/api/{0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch => 0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch} (100%) rename patches/api/{0400-Win-Screen-API.patch => 0399-Win-Screen-API.patch} (96%) rename patches/api/{0401-Add-Entity-Body-Yaw-API.patch => 0400-Add-Entity-Body-Yaw-API.patch} (93%) rename patches/api/{0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch => 0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch} (100%) rename patches/api/{0403-Add-EntityFertilizeEggEvent.patch => 0402-Add-EntityFertilizeEggEvent.patch} (100%) rename patches/api/{0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%) rename patches/api/{0405-Add-Shearable-API.patch => 0404-Add-Shearable-API.patch} (97%) rename patches/api/{0406-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0405-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%) rename patches/api/{0407-Add-Mob-Experience-reward-API.patch => 0406-Add-Mob-Experience-reward-API.patch} (100%) rename patches/api/{0408-Expand-PlayerItemMendEvent.patch => 0407-Expand-PlayerItemMendEvent.patch} (100%) rename patches/api/{0409-Add-transient-modifier-API.patch => 0408-Add-transient-modifier-API.patch} (100%) rename patches/api/{0410-Properly-remove-the-experimental-smithing-inventory-.patch => 0409-Properly-remove-the-experimental-smithing-inventory-.patch} (100%) rename patches/api/{0411-Add-method-to-remove-all-active-potion-effects.patch => 0410-Add-method-to-remove-all-active-potion-effects.patch} (91%) rename patches/api/{0412-Folia-scheduler-and-owned-region-API.patch => 0411-Folia-scheduler-and-owned-region-API.patch} (99%) rename patches/api/{0413-Add-event-for-player-editing-sign.patch => 0412-Add-event-for-player-editing-sign.patch} (100%) rename patches/api/{0414-Add-Sign-getInteractableSideFor.patch => 0413-Add-Sign-getInteractableSideFor.patch} (100%) rename patches/api/{0415-Fix-BanList-API.patch => 0414-Fix-BanList-API.patch} (100%) rename patches/api/{0416-Add-whitelist-events.patch => 0415-Add-whitelist-events.patch} (100%) rename patches/api/{0417-API-for-updating-recipes-on-clients.patch => 0416-API-for-updating-recipes-on-clients.patch} (100%) rename patches/api/{0418-Add-PlayerFailMoveEvent.patch => 0417-Add-PlayerFailMoveEvent.patch} (100%) rename patches/api/{0419-Fix-custom-statistic-criteria-creation.patch => 0418-Fix-custom-statistic-criteria-creation.patch} (100%) rename patches/api/{0420-SculkCatalyst-bloom-API.patch => 0419-SculkCatalyst-bloom-API.patch} (100%) rename patches/api/{0421-API-for-an-entity-s-scoreboard-name.patch => 0420-API-for-an-entity-s-scoreboard-name.patch} (88%) rename patches/api/{0422-Deprecate-and-replace-methods-with-old-StructureType.patch => 0421-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%) rename patches/api/{0423-Add-Listing-API-for-Player.patch => 0422-Add-Listing-API-for-Player.patch} (100%) rename patches/api/{0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%) rename patches/api/{0425-Fix-NPE-on-Boat-getStatus.patch => 0424-Fix-NPE-on-Boat-getStatus.patch} (100%) rename patches/api/{0426-Expand-Pose-API.patch => 0425-Expand-Pose-API.patch} (92%) rename patches/api/{0427-MerchantRecipe-add-copy-constructor.patch => 0426-MerchantRecipe-add-copy-constructor.patch} (100%) rename patches/api/{0428-More-DragonBattle-API.patch => 0427-More-DragonBattle-API.patch} (100%) rename patches/api/{0429-Add-PlayerPickItemEvent.patch => 0428-Add-PlayerPickItemEvent.patch} (100%) rename patches/api/{0430-Allow-trident-custom-damage.patch => 0429-Allow-trident-custom-damage.patch} (100%) rename patches/api/{0431-Expose-hand-during-BlockCanBuildEvent.patch => 0430-Expose-hand-during-BlockCanBuildEvent.patch} (100%) rename patches/api/{0432-Limit-setBurnTime-to-valid-short-values.patch => 0431-Limit-setBurnTime-to-valid-short-values.patch} (100%) rename patches/api/{0433-Add-OfflinePlayer-isConnected.patch => 0432-Add-OfflinePlayer-isConnected.patch} (95%) rename patches/api/{0434-Add-titleOverride-to-InventoryOpenEvent.patch => 0433-Add-titleOverride-to-InventoryOpenEvent.patch} (100%) rename patches/api/{0435-Allow-proper-checking-of-empty-item-stacks.patch => 0434-Allow-proper-checking-of-empty-item-stacks.patch} (100%) rename patches/api/{0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch => 0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch} (100%) rename patches/api/{0437-Add-player-idle-duration-API.patch => 0436-Add-player-idle-duration-API.patch} (100%) rename patches/api/{0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%) rename patches/api/{0439-Add-predicate-for-blocks-when-raytracing.patch => 0438-Add-predicate-for-blocks-when-raytracing.patch} (100%) rename patches/api/{0440-Add-hand-to-fish-event-for-all-player-interactions.patch => 0439-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%) rename patches/api/{0441-Add-UUID-attribute-modifier-API.patch => 0440-Add-UUID-attribute-modifier-API.patch} (100%) rename patches/api/{0442-Expand-LingeringPotion-API.patch => 0441-Expand-LingeringPotion-API.patch} (100%) rename patches/api/{0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch => 0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch} (100%) rename patches/api/{0444-Add-Structure-check-API.patch => 0443-Add-Structure-check-API.patch} (100%) rename patches/api/{0445-add-missing-Experimental-annotations.patch => 0444-add-missing-Experimental-annotations.patch} (100%) rename patches/api/{0446-Add-more-scoreboard-API.patch => 0445-Add-more-scoreboard-API.patch} (100%) rename patches/api/{0447-Improve-Registry.patch => 0446-Improve-Registry.patch} (100%) rename patches/api/{0448-Add-experience-points-API.patch => 0447-Add-experience-points-API.patch} (100%) rename patches/api/{0449-Add-missing-InventoryType.patch => 0448-Add-missing-InventoryType.patch} (100%) rename patches/api/{0450-Add-drops-to-shear-events.patch => 0449-Add-drops-to-shear-events.patch} (100%) rename patches/api/{0451-Add-HiddenPotionEffect-API.patch => 0450-Add-HiddenPotionEffect-API.patch} (98%) rename patches/api/{0452-Add-PlayerShieldDisableEvent.patch => 0451-Add-PlayerShieldDisableEvent.patch} (100%) rename patches/api/{0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch => 0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch} (100%) rename patches/api/{0454-Add-BlockStateMeta-clearBlockState.patch => 0453-Add-BlockStateMeta-clearBlockState.patch} (100%) rename patches/api/{0455-Expose-LootTable-of-DecoratedPot.patch => 0454-Expose-LootTable-of-DecoratedPot.patch} (100%) rename patches/api/{0456-Add-ShulkerDuplicateEvent.patch => 0455-Add-ShulkerDuplicateEvent.patch} (100%) rename patches/api/{0457-Add-api-for-spawn-egg-texture-colors.patch => 0456-Add-api-for-spawn-egg-texture-colors.patch} (100%) rename patches/api/{0458-Add-Lifecycle-Event-system.patch => 0457-Add-Lifecycle-Event-system.patch} (100%) rename patches/api/{0459-Conduit-API.patch => 0458-Conduit-API.patch} (100%) rename patches/api/{0460-ItemStack-Tooltip-API.patch => 0459-ItemStack-Tooltip-API.patch} (100%) rename patches/api/{0461-Add-getChunkSnapshot-includeLightData-parameter.patch => 0460-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%) rename patches/api/{0462-Add-FluidState-API.patch => 0461-Add-FluidState-API.patch} (100%) rename patches/api/{0463-add-number-format-api.patch => 0462-add-number-format-api.patch} (100%) rename patches/api/{0464-improve-BanList-types.patch => 0463-improve-BanList-types.patch} (100%) rename patches/api/{0465-Suspicious-Effect-Entry-API.patch => 0464-Suspicious-Effect-Entry-API.patch} (100%) rename patches/api/{0466-Fix-DamageSource-API.patch => 0465-Fix-DamageSource-API.patch} (100%) rename patches/api/{0467-Expanded-Hopper-API.patch => 0466-Expanded-Hopper-API.patch} (100%) rename patches/api/{0468-Clone-mutables-to-prevent-unexpected-issues.patch => 0467-Clone-mutables-to-prevent-unexpected-issues.patch} (100%) rename patches/server/{0386-Add-PlayerRecipeBookClickEvent.patch => 0385-Add-PlayerRecipeBookClickEvent.patch} (100%) delete mode 100644 patches/server/0385-Improve-Arrow-API.patch rename patches/server/{0387-Hide-sync-chunk-writes-behind-flag.patch => 0386-Hide-sync-chunk-writes-behind-flag.patch} (100%) rename patches/server/{0388-Add-permission-for-command-blocks.patch => 0387-Add-permission-for-command-blocks.patch} (100%) rename patches/server/{0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch => 0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch} (97%) rename patches/server/{0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch => 0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch} (100%) rename patches/server/{0391-Paper-dumpitem-command.patch => 0390-Paper-dumpitem-command.patch} (100%) rename patches/server/{0392-Improve-Legacy-Component-serialization-size.patch => 0391-Improve-Legacy-Component-serialization-size.patch} (100%) rename patches/server/{0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch => 0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch} (100%) rename patches/server/{0394-Add-BlockStateMeta-clearBlockState.patch => 0393-Add-BlockStateMeta-clearBlockState.patch} (100%) rename patches/server/{0395-Support-old-UUID-format-for-NBT.patch => 0394-Support-old-UUID-format-for-NBT.patch} (100%) rename patches/server/{0396-Convert-legacy-attributes-in-Item-Meta.patch => 0395-Convert-legacy-attributes-in-Item-Meta.patch} (100%) rename patches/server/{0397-Do-not-accept-invalid-client-settings.patch => 0396-Do-not-accept-invalid-client-settings.patch} (100%) rename patches/server/{0398-Improve-fix-EntityTargetLivingEntityEvent.patch => 0397-Improve-fix-EntityTargetLivingEntityEvent.patch} (100%) rename patches/server/{0399-Add-entity-liquid-API.patch => 0398-Add-entity-liquid-API.patch} (100%) rename patches/server/{0400-Update-itemstack-legacy-name-and-lore.patch => 0399-Update-itemstack-legacy-name-and-lore.patch} (100%) rename patches/server/{0401-Add-PrepareResultEvent.patch => 0400-Add-PrepareResultEvent.patch} (100%) rename patches/server/{0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch => 0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch} (100%) rename patches/server/{0403-Fix-arrows-never-despawning-MC-125757.patch => 0402-Fix-arrows-never-despawning-MC-125757.patch} (100%) rename patches/server/{0404-Thread-Safe-Vanilla-Command-permission-checking.patch => 0403-Thread-Safe-Vanilla-Command-permission-checking.patch} (100%) rename patches/server/{0405-Fix-SPIGOT-5989.patch => 0404-Fix-SPIGOT-5989.patch} (100%) rename patches/server/{0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%) rename patches/server/{0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%) rename patches/server/{0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch => 0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch} (100%) rename patches/server/{0409-Optimize-NetworkManager-Exception-Handling.patch => 0408-Optimize-NetworkManager-Exception-Handling.patch} (100%) rename patches/server/{0410-Fix-some-rails-connecting-improperly.patch => 0409-Fix-some-rails-connecting-improperly.patch} (100%) rename patches/server/{0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch => 0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch} (100%) rename patches/server/{0412-Brand-support.patch => 0411-Brand-support.patch} (100%) rename patches/server/{0413-Add-playPickupItemAnimation-to-LivingEntity.patch => 0412-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%) rename patches/server/{0414-Don-t-require-FACING-data.patch => 0413-Don-t-require-FACING-data.patch} (100%) rename patches/server/{0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (100%) rename patches/server/{0416-Add-moon-phase-API.patch => 0415-Add-moon-phase-API.patch} (100%) rename patches/server/{0417-Do-not-let-the-server-load-chunks-from-newer-version.patch => 0416-Do-not-let-the-server-load-chunks-from-newer-version.patch} (100%) rename patches/server/{0418-Prevent-headless-pistons-from-being-created.patch => 0417-Prevent-headless-pistons-from-being-created.patch} (100%) rename patches/server/{0419-Add-BellRingEvent.patch => 0418-Add-BellRingEvent.patch} (100%) rename patches/server/{0420-Add-zombie-targets-turtle-egg-config.patch => 0419-Add-zombie-targets-turtle-egg-config.patch} (100%) rename patches/server/{0421-Buffer-joins-to-world.patch => 0420-Buffer-joins-to-world.patch} (100%) rename patches/server/{0422-Fix-hex-colors-not-working-in-some-kick-messages.patch => 0421-Fix-hex-colors-not-working-in-some-kick-messages.patch} (100%) rename patches/server/{0423-PortalCreateEvent-needs-to-know-its-entity.patch => 0422-PortalCreateEvent-needs-to-know-its-entity.patch} (100%) rename patches/server/{0424-Add-more-Evoker-API.patch => 0423-Add-more-Evoker-API.patch} (100%) rename patches/server/{0425-Add-methods-to-get-translation-keys.patch => 0424-Add-methods-to-get-translation-keys.patch} (100%) rename patches/server/{0426-Create-HoverEvent-from-ItemStack-Entity.patch => 0425-Create-HoverEvent-from-ItemStack-Entity.patch} (100%) rename patches/server/{0427-Cache-block-data-strings.patch => 0426-Cache-block-data-strings.patch} (100%) rename patches/server/{0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (98%) rename patches/server/{0429-Add-additional-open-container-api-to-HumanEntity.patch => 0428-Add-additional-open-container-api-to-HumanEntity.patch} (100%) rename patches/server/{0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%) rename patches/server/{0431-Extend-block-drop-capture-to-capture-all-items-added.patch => 0430-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%) rename patches/server/{0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (94%) rename patches/server/{0433-Lazily-track-plugin-scoreboards-by-default.patch => 0432-Lazily-track-plugin-scoreboards-by-default.patch} (100%) rename patches/server/{0434-Entity-isTicking.patch => 0433-Entity-isTicking.patch} (94%) rename patches/server/{0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch => 0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch} (100%) rename patches/server/{0436-Fix-Concurrency-issue-in-ShufflingList.patch => 0435-Fix-Concurrency-issue-in-ShufflingList.patch} (100%) rename patches/server/{0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch => 0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch} (100%) rename patches/server/{0438-Fix-for-large-move-vectors-crashing-server.patch => 0437-Fix-for-large-move-vectors-crashing-server.patch} (100%) rename patches/server/{0439-Optimise-getType-calls.patch => 0438-Optimise-getType-calls.patch} (100%) rename patches/server/{0440-Villager-resetOffers.patch => 0439-Villager-resetOffers.patch} (100%) rename patches/server/{0441-Retain-block-place-order-when-capturing-blockstates.patch => 0440-Retain-block-place-order-when-capturing-blockstates.patch} (100%) rename patches/server/{0442-Reduce-blockpos-allocation-from-pathfinding.patch => 0441-Reduce-blockpos-allocation-from-pathfinding.patch} (100%) rename patches/server/{0443-Fix-item-locations-dropped-from-campfires.patch => 0442-Fix-item-locations-dropped-from-campfires.patch} (100%) rename patches/server/{0444-Fix-bell-block-entity-memory-leak.patch => 0443-Fix-bell-block-entity-memory-leak.patch} (100%) rename patches/server/{0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch => 0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch} (100%) rename patches/server/{0446-Add-getOfflinePlayerIfCached-String.patch => 0445-Add-getOfflinePlayerIfCached-String.patch} (100%) rename patches/server/{0447-Add-ignore-discounts-API.patch => 0446-Add-ignore-discounts-API.patch} (100%) rename patches/server/{0448-Toggle-for-removing-existing-dragon.patch => 0447-Toggle-for-removing-existing-dragon.patch} (100%) rename patches/server/{0449-Fix-client-lag-on-advancement-loading.patch => 0448-Fix-client-lag-on-advancement-loading.patch} (100%) rename patches/server/{0450-Item-no-age-no-player-pickup.patch => 0449-Item-no-age-no-player-pickup.patch} (100%) rename patches/server/{0451-Beacon-API-custom-effect-ranges.patch => 0450-Beacon-API-custom-effect-ranges.patch} (100%) rename patches/server/{0452-Add-API-for-quit-reason.patch => 0451-Add-API-for-quit-reason.patch} (100%) rename patches/server/{0453-Add-Wandering-Trader-spawn-rate-config-options.patch => 0452-Add-Wandering-Trader-spawn-rate-config-options.patch} (100%) rename patches/server/{0454-Expose-world-spawn-angle.patch => 0453-Expose-world-spawn-angle.patch} (100%) rename patches/server/{0455-Add-Destroy-Speed-API.patch => 0454-Add-Destroy-Speed-API.patch} (100%) rename patches/server/{0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch => 0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch} (100%) rename patches/server/{0457-Add-LivingEntity-clearActiveItem.patch => 0456-Add-LivingEntity-clearActiveItem.patch} (100%) rename patches/server/{0458-Add-PlayerItemCooldownEvent.patch => 0457-Add-PlayerItemCooldownEvent.patch} (100%) rename patches/server/{0459-Significantly-improve-performance-of-the-end-generat.patch => 0458-Significantly-improve-performance-of-the-end-generat.patch} (100%) rename patches/server/{0460-More-lightning-API.patch => 0459-More-lightning-API.patch} (100%) rename patches/server/{0461-Climbing-should-not-bypass-cramming-gamerule.patch => 0460-Climbing-should-not-bypass-cramming-gamerule.patch} (98%) rename patches/server/{0462-Add-missing-default-perms-for-commands.patch => 0461-Add-missing-default-perms-for-commands.patch} (100%) rename patches/server/{0463-Add-PlayerShearBlockEvent.patch => 0462-Add-PlayerShearBlockEvent.patch} (100%) rename patches/server/{0464-Limit-recipe-packets.patch => 0463-Limit-recipe-packets.patch} (100%) rename patches/server/{0465-Fix-CraftSound-backwards-compatibility.patch => 0464-Fix-CraftSound-backwards-compatibility.patch} (100%) rename patches/server/{0466-Player-Chunk-Load-Unload-Events.patch => 0465-Player-Chunk-Load-Unload-Events.patch} (100%) rename patches/server/{0467-Optimize-Dynamic-get-Missing-Keys.patch => 0466-Optimize-Dynamic-get-Missing-Keys.patch} (100%) rename patches/server/{0468-Expose-LivingEntity-hurt-direction.patch => 0467-Expose-LivingEntity-hurt-direction.patch} (100%) rename patches/server/{0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%) rename patches/server/{0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch => 0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch} (100%) rename patches/server/{0471-Add-TargetHitEvent.patch => 0470-Add-TargetHitEvent.patch} (100%) rename patches/server/{0472-MC-4-Fix-item-position-desync.patch => 0471-MC-4-Fix-item-position-desync.patch} (96%) rename patches/server/{0473-Additional-Block-Material-API.patch => 0472-Additional-Block-Material-API.patch} (100%) rename patches/server/{0474-Fix-harming-potion-dupe.patch => 0473-Fix-harming-potion-dupe.patch} (100%) rename patches/server/{0475-API-to-get-Material-from-Boats-and-Minecarts.patch => 0474-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%) rename patches/server/{0476-Cache-burn-durations.patch => 0475-Cache-burn-durations.patch} (100%) rename patches/server/{0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch => 0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch} (100%) rename patches/server/{0478-Fix-Not-a-string-Map-Conversion-spam.patch => 0477-Fix-Not-a-string-Map-Conversion-spam.patch} (100%) rename patches/server/{0479-Add-PlayerFlowerPotManipulateEvent.patch => 0478-Add-PlayerFlowerPotManipulateEvent.patch} (100%) rename patches/server/{0480-Fix-interact-event-not-being-called-sometimes.patch => 0479-Fix-interact-event-not-being-called-sometimes.patch} (100%) rename patches/server/{0481-Zombie-API-breaking-doors.patch => 0480-Zombie-API-breaking-doors.patch} (100%) rename patches/server/{0482-Fix-nerfed-slime-when-splitting.patch => 0481-Fix-nerfed-slime-when-splitting.patch} (100%) rename patches/server/{0483-Add-EntityLoadCrossbowEvent.patch => 0482-Add-EntityLoadCrossbowEvent.patch} (100%) rename patches/server/{0484-Add-WorldGameRuleChangeEvent.patch => 0483-Add-WorldGameRuleChangeEvent.patch} (100%) rename patches/server/{0485-Add-ServerResourcesReloadedEvent.patch => 0484-Add-ServerResourcesReloadedEvent.patch} (100%) rename patches/server/{0486-Add-world-settings-for-mobs-picking-up-loot.patch => 0485-Add-world-settings-for-mobs-picking-up-loot.patch} (100%) rename patches/server/{0487-Add-BlockFailedDispenseEvent.patch => 0486-Add-BlockFailedDispenseEvent.patch} (100%) rename patches/server/{0488-Add-PlayerLecternPageChangeEvent.patch => 0487-Add-PlayerLecternPageChangeEvent.patch} (100%) rename patches/server/{0489-Add-PlayerLoomPatternSelectEvent.patch => 0488-Add-PlayerLoomPatternSelectEvent.patch} (100%) rename patches/server/{0490-Configurable-door-breaking-difficulty.patch => 0489-Configurable-door-breaking-difficulty.patch} (100%) rename patches/server/{0491-Empty-commands-shall-not-be-dispatched.patch => 0490-Empty-commands-shall-not-be-dispatched.patch} (100%) rename patches/server/{0492-Remove-stale-POIs.patch => 0491-Remove-stale-POIs.patch} (100%) rename patches/server/{0493-Fix-villager-boat-exploit.patch => 0492-Fix-villager-boat-exploit.patch} (100%) rename patches/server/{0494-Add-sendOpLevel-API.patch => 0493-Add-sendOpLevel-API.patch} (100%) rename patches/server/{0495-TODO-Registry-Modification-API.patch => 0494-TODO-Registry-Modification-API.patch} (100%) rename patches/server/{0496-Add-StructuresLocateEvent.patch => 0495-Add-StructuresLocateEvent.patch} (100%) rename patches/server/{0497-Collision-option-for-requiring-a-player-participant.patch => 0496-Collision-option-for-requiring-a-player-participant.patch} (97%) rename patches/server/{0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch => 0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch} (100%) rename patches/server/{0499-Return-chat-component-with-empty-text-instead-of-thr.patch => 0498-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%) rename patches/server/{0500-Make-schedule-command-per-world.patch => 0499-Make-schedule-command-per-world.patch} (100%) rename patches/server/{0501-Configurable-max-leash-distance.patch => 0500-Configurable-max-leash-distance.patch} (100%) rename patches/server/{0502-Add-BlockPreDispenseEvent.patch => 0501-Add-BlockPreDispenseEvent.patch} (100%) rename patches/server/{0503-Add-PlayerChangeBeaconEffectEvent.patch => 0502-Add-PlayerChangeBeaconEffectEvent.patch} (100%) rename patches/server/{0504-Add-toggle-for-always-placing-the-dragon-egg.patch => 0503-Add-toggle-for-always-placing-the-dragon-egg.patch} (100%) rename patches/server/{0505-Add-PlayerStonecutterRecipeSelectEvent.patch => 0504-Add-PlayerStonecutterRecipeSelectEvent.patch} (100%) rename patches/server/{0506-Expand-EntityUnleashEvent.patch => 0505-Expand-EntityUnleashEvent.patch} (100%) rename patches/server/{0507-Reset-shield-blocking-on-dimension-change.patch => 0506-Reset-shield-blocking-on-dimension-change.patch} (100%) rename patches/server/{0508-Add-DragonEggFormEvent.patch => 0507-Add-DragonEggFormEvent.patch} (100%) rename patches/server/{0509-Add-EntityMoveEvent.patch => 0508-Add-EntityMoveEvent.patch} (100%) rename patches/server/{0510-added-option-to-disable-pathfinding-updates-on-block.patch => 0509-added-option-to-disable-pathfinding-updates-on-block.patch} (100%) rename patches/server/{0511-Inline-shift-direction-fields.patch => 0510-Inline-shift-direction-fields.patch} (100%) rename patches/server/{0512-Allow-adding-items-to-BlockDropItemEvent.patch => 0511-Allow-adding-items-to-BlockDropItemEvent.patch} (100%) rename patches/server/{0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%) rename patches/server/{0514-living-entity-allow-attribute-registration.patch => 0513-living-entity-allow-attribute-registration.patch} (100%) rename patches/server/{0515-fix-dead-slime-setSize-invincibility.patch => 0514-fix-dead-slime-setSize-invincibility.patch} (100%) rename patches/server/{0516-Merchant-getRecipes-should-return-an-immutable-list.patch => 0515-Merchant-getRecipes-should-return-an-immutable-list.patch} (100%) rename patches/server/{0517-Expose-Tracked-Players.patch => 0516-Expose-Tracked-Players.patch} (100%) rename patches/server/{0518-Improve-ServerGUI.patch => 0517-Improve-ServerGUI.patch} (100%) rename patches/server/{0519-fix-converting-txt-to-json-file.patch => 0518-fix-converting-txt-to-json-file.patch} (100%) rename patches/server/{0520-Add-worldborder-events.patch => 0519-Add-worldborder-events.patch} (100%) rename patches/server/{0521-Add-PlayerNameEntityEvent.patch => 0520-Add-PlayerNameEntityEvent.patch} (100%) rename patches/server/{0522-Prevent-grindstones-from-overstacking-items.patch => 0521-Prevent-grindstones-from-overstacking-items.patch} (100%) rename patches/server/{0523-Add-recipe-to-cook-events.patch => 0522-Add-recipe-to-cook-events.patch} (100%) rename patches/server/{0524-Add-Block-isValidTool.patch => 0523-Add-Block-isValidTool.patch} (100%) rename patches/server/{0525-Allow-using-signs-inside-spawn-protection.patch => 0524-Allow-using-signs-inside-spawn-protection.patch} (100%) rename patches/server/{0526-Expand-world-key-API.patch => 0525-Expand-world-key-API.patch} (100%) rename patches/server/{0527-Add-fast-alternative-constructor-for-Rotations.patch => 0526-Add-fast-alternative-constructor-for-Rotations.patch} (100%) rename patches/server/{0528-Item-Rarity-API.patch => 0527-Item-Rarity-API.patch} (100%) rename patches/server/{0529-Drop-carried-item-when-player-has-disconnected.patch => 0528-Drop-carried-item-when-player-has-disconnected.patch} (100%) rename patches/server/{0530-forced-whitelist-use-configurable-kick-message.patch => 0529-forced-whitelist-use-configurable-kick-message.patch} (100%) rename patches/server/{0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%) rename patches/server/{0532-Expose-protocol-version.patch => 0531-Expose-protocol-version.patch} (100%) rename patches/server/{0533-Enhance-console-tab-completions-for-brigadier-comman.patch => 0532-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%) rename patches/server/{0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%) rename patches/server/{0535-Add-bypass-host-check.patch => 0534-Add-bypass-host-check.patch} (100%) rename patches/server/{0536-Set-area-affect-cloud-rotation.patch => 0535-Set-area-affect-cloud-rotation.patch} (100%) rename patches/server/{0537-add-isDeeplySleeping-to-HumanEntity.patch => 0536-add-isDeeplySleeping-to-HumanEntity.patch} (100%) rename patches/server/{0538-add-consumeFuel-to-FurnaceBurnEvent.patch => 0537-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%) rename patches/server/{0539-add-get-set-drop-chance-to-EntityEquipment.patch => 0538-add-get-set-drop-chance-to-EntityEquipment.patch} (100%) rename patches/server/{0540-fix-PigZombieAngerEvent-cancellation.patch => 0539-fix-PigZombieAngerEvent-cancellation.patch} (100%) rename patches/server/{0541-fix-PlayerItemHeldEvent-firing-twice.patch => 0540-fix-PlayerItemHeldEvent-firing-twice.patch} (100%) rename patches/server/{0542-Add-PlayerDeepSleepEvent.patch => 0541-Add-PlayerDeepSleepEvent.patch} (100%) rename patches/server/{0543-More-World-API.patch => 0542-More-World-API.patch} (100%) rename patches/server/{0544-Add-PlayerBedFailEnterEvent.patch => 0543-Add-PlayerBedFailEnterEvent.patch} (100%) rename patches/server/{0545-Implement-methods-to-convert-between-Component-and-B.patch => 0544-Implement-methods-to-convert-between-Component-and-B.patch} (100%) rename patches/server/{0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch => 0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch} (100%) rename patches/server/{0547-Introduce-beacon-activation-deactivation-events.patch => 0546-Introduce-beacon-activation-deactivation-events.patch} (100%) rename patches/server/{0548-Add-Channel-initialization-listeners.patch => 0547-Add-Channel-initialization-listeners.patch} (100%) rename patches/server/{0549-Send-empty-commands-if-tab-completion-is-disabled.patch => 0548-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%) rename patches/server/{0550-Add-more-WanderingTrader-API.patch => 0549-Add-more-WanderingTrader-API.patch} (100%) rename patches/server/{0551-Add-EntityBlockStorage-clearEntities.patch => 0550-Add-EntityBlockStorage-clearEntities.patch} (100%) rename patches/server/{0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%) rename patches/server/{0553-Add-HiddenPotionEffect-API.patch => 0552-Add-HiddenPotionEffect-API.patch} (100%) rename patches/server/{0554-Inventory-close.patch => 0553-Inventory-close.patch} (100%) rename patches/server/{0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%) rename patches/server/{0556-Add-basic-Datapack-API.patch => 0555-Add-basic-Datapack-API.patch} (100%) rename patches/server/{0557-Add-environment-variable-to-disable-server-gui.patch => 0556-Add-environment-variable-to-disable-server-gui.patch} (100%) rename patches/server/{0558-Expand-PlayerGameModeChangeEvent.patch => 0557-Expand-PlayerGameModeChangeEvent.patch} (100%) rename patches/server/{0559-ItemStack-repair-check-API.patch => 0558-ItemStack-repair-check-API.patch} (100%) rename patches/server/{0560-More-Enchantment-API.patch => 0559-More-Enchantment-API.patch} (100%) rename patches/server/{0561-Move-range-check-for-block-placing-up.patch => 0560-Move-range-check-for-block-placing-up.patch} (100%) rename patches/server/{0562-Add-Mob-lookAt-API.patch => 0561-Add-Mob-lookAt-API.patch} (100%) rename patches/server/{0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (100%) rename patches/server/{0564-Add-Unix-domain-socket-support.patch => 0563-Add-Unix-domain-socket-support.patch} (100%) rename patches/server/{0565-Add-EntityInsideBlockEvent.patch => 0564-Add-EntityInsideBlockEvent.patch} (100%) rename patches/server/{0566-Attributes-API-for-item-defaults.patch => 0565-Attributes-API-for-item-defaults.patch} (100%) rename patches/server/{0567-Add-cause-to-Weather-ThunderChangeEvents.patch => 0566-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%) rename patches/server/{0568-More-Lidded-Block-API.patch => 0567-More-Lidded-Block-API.patch} (100%) rename patches/server/{0569-Limit-item-frame-cursors-on-maps.patch => 0568-Limit-item-frame-cursors-on-maps.patch} (100%) rename patches/server/{0570-Add-PlayerKickEvent-causes.patch => 0569-Add-PlayerKickEvent-causes.patch} (100%) rename patches/server/{0571-Add-PufferFishStateChangeEvent.patch => 0570-Add-PufferFishStateChangeEvent.patch} (100%) rename patches/server/{0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%) rename patches/server/{0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%) rename patches/server/{0574-Add-option-to-fix-items-merging-through-walls.patch => 0573-Add-option-to-fix-items-merging-through-walls.patch} (100%) rename patches/server/{0575-Add-BellRevealRaiderEvent.patch => 0574-Add-BellRevealRaiderEvent.patch} (100%) rename patches/server/{0576-Fix-invulnerable-end-crystals.patch => 0575-Fix-invulnerable-end-crystals.patch} (100%) rename patches/server/{0577-Add-ElderGuardianAppearanceEvent.patch => 0576-Add-ElderGuardianAppearanceEvent.patch} (100%) rename patches/server/{0578-Fix-dangerous-end-portal-logic.patch => 0577-Fix-dangerous-end-portal-logic.patch} (97%) rename patches/server/{0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%) rename patches/server/{0580-Make-item-validations-configurable.patch => 0579-Make-item-validations-configurable.patch} (100%) rename patches/server/{0581-Line-Of-Sight-Changes.patch => 0580-Line-Of-Sight-Changes.patch} (100%) rename patches/server/{0582-add-per-world-spawn-limits.patch => 0581-add-per-world-spawn-limits.patch} (100%) rename patches/server/{0583-Fix-potions-splash-events.patch => 0582-Fix-potions-splash-events.patch} (100%) rename patches/server/{0584-Add-more-LimitedRegion-API.patch => 0583-Add-more-LimitedRegion-API.patch} (100%) rename patches/server/{0585-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0584-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%) rename patches/server/{0586-Missing-Entity-API.patch => 0585-Missing-Entity-API.patch} (98%) rename patches/server/{0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%) rename patches/server/{0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%) rename patches/server/{0589-Use-getChunkIfLoadedImmediately-in-places.patch => 0588-Use-getChunkIfLoadedImmediately-in-places.patch} (100%) rename patches/server/{0590-Fix-commands-from-signs-not-firing-command-events.patch => 0589-Fix-commands-from-signs-not-firing-command-events.patch} (100%) rename patches/server/{0591-Add-PlayerArmSwingEvent.patch => 0590-Add-PlayerArmSwingEvent.patch} (100%) rename patches/server/{0592-Fix-kick-event-leave-message-not-being-sent.patch => 0591-Fix-kick-event-leave-message-not-being-sent.patch} (100%) rename patches/server/{0593-Add-config-for-mobs-immune-to-default-effects.patch => 0592-Add-config-for-mobs-immune-to-default-effects.patch} (100%) rename patches/server/{0594-Don-t-apply-cramming-damage-to-players.patch => 0593-Don-t-apply-cramming-damage-to-players.patch} (100%) rename patches/server/{0595-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0594-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%) rename patches/server/{0596-Add-missing-forceDrop-toggles.patch => 0595-Add-missing-forceDrop-toggles.patch} (100%) rename patches/server/{0597-Stinger-API.patch => 0596-Stinger-API.patch} (95%) rename patches/server/{0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch => 0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch} (100%) rename patches/server/{0599-Add-System.out-err-catcher.patch => 0598-Add-System.out-err-catcher.patch} (100%) rename patches/server/{0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%) rename patches/server/{0601-Prevent-AFK-kick-while-watching-end-credits.patch => 0600-Prevent-AFK-kick-while-watching-end-credits.patch} (100%) rename patches/server/{0602-Allow-skipping-writing-of-comments-to-server.propert.patch => 0601-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%) rename patches/server/{0603-Add-PlayerSetSpawnEvent.patch => 0602-Add-PlayerSetSpawnEvent.patch} (100%) rename patches/server/{0604-Make-hoppers-respect-inventory-max-stack-size.patch => 0603-Make-hoppers-respect-inventory-max-stack-size.patch} (94%) rename patches/server/{0605-Optimize-entity-tracker-passenger-checks.patch => 0604-Optimize-entity-tracker-passenger-checks.patch} (100%) rename patches/server/{0606-Config-option-for-Piglins-guarding-chests.patch => 0605-Config-option-for-Piglins-guarding-chests.patch} (100%) rename patches/server/{0607-Add-EntityDamageItemEvent.patch => 0606-Add-EntityDamageItemEvent.patch} (100%) rename patches/server/{0608-Optimize-indirect-passenger-iteration.patch => 0607-Optimize-indirect-passenger-iteration.patch} (96%) rename patches/server/{0609-Configurable-item-frame-map-cursor-update-interval.patch => 0608-Configurable-item-frame-map-cursor-update-interval.patch} (100%) rename patches/server/{0610-Clear-bucket-NBT-after-dispense.patch => 0609-Clear-bucket-NBT-after-dispense.patch} (100%) rename patches/server/{0611-Change-EnderEye-target-without-changing-other-things.patch => 0610-Change-EnderEye-target-without-changing-other-things.patch} (100%) rename patches/server/{0612-Add-BlockBreakBlockEvent.patch => 0611-Add-BlockBreakBlockEvent.patch} (100%) rename patches/server/{0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%) rename patches/server/{0614-More-CommandBlock-API.patch => 0613-More-CommandBlock-API.patch} (100%) rename patches/server/{0615-Add-missing-team-sidebar-display-slots.patch => 0614-Add-missing-team-sidebar-display-slots.patch} (100%) rename patches/server/{0616-Add-back-EntityPortalExitEvent.patch => 0615-Add-back-EntityPortalExitEvent.patch} (97%) rename patches/server/{0617-Add-methods-to-find-targets-for-lightning-strikes.patch => 0616-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%) rename patches/server/{0618-Get-entity-default-attributes.patch => 0617-Get-entity-default-attributes.patch} (100%) rename patches/server/{0619-Left-handed-API.patch => 0618-Left-handed-API.patch} (100%) rename patches/server/{0620-Add-more-advancement-API.patch => 0619-Add-more-advancement-API.patch} (100%) rename patches/server/{0621-Add-ItemFactory-getSpawnEgg-API.patch => 0620-Add-ItemFactory-getSpawnEgg-API.patch} (100%) rename patches/server/{0622-Add-critical-damage-API.patch => 0621-Add-critical-damage-API.patch} (100%) rename patches/server/{0623-Fix-issues-with-mob-conversion.patch => 0622-Fix-issues-with-mob-conversion.patch} (100%) rename patches/server/{0624-Add-isCollidable-methods-to-various-places.patch => 0623-Add-isCollidable-methods-to-various-places.patch} (100%) rename patches/server/{0625-Goat-ram-API.patch => 0624-Goat-ram-API.patch} (100%) rename patches/server/{0626-Add-API-for-resetting-a-single-score.patch => 0625-Add-API-for-resetting-a-single-score.patch} (100%) rename patches/server/{0627-Add-Raw-Byte-Entity-Serialization.patch => 0626-Add-Raw-Byte-Entity-Serialization.patch} (97%) rename patches/server/{0628-Vanilla-command-permission-fixes.patch => 0627-Vanilla-command-permission-fixes.patch} (100%) rename patches/server/{0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%) rename patches/server/{0630-Fix-GameProfileCache-concurrency.patch => 0629-Fix-GameProfileCache-concurrency.patch} (100%) rename patches/server/{0631-Improve-and-expand-AsyncCatcher.patch => 0630-Improve-and-expand-AsyncCatcher.patch} (99%) rename patches/server/{0632-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0631-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%) rename patches/server/{0633-Sanitize-ResourceLocation-error-logging.patch => 0632-Sanitize-ResourceLocation-error-logging.patch} (100%) rename patches/server/{0634-Manually-inline-methods-in-BlockPosition.patch => 0633-Manually-inline-methods-in-BlockPosition.patch} (100%) rename patches/server/{0635-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0634-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%) rename patches/server/{0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%) rename patches/server/{0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%) rename patches/server/{0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch => 0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch} (100%) rename patches/server/{0639-Time-scoreboard-search.patch => 0638-Time-scoreboard-search.patch} (100%) rename patches/server/{0640-Oprimise-map-impl-for-tracked-players.patch => 0639-Oprimise-map-impl-for-tracked-players.patch} (100%) rename patches/server/{0641-Add-missing-InventoryType.patch => 0640-Add-missing-InventoryType.patch} (100%) rename patches/server/{0642-Optimise-BlockSoil-nearby-water-lookup.patch => 0641-Optimise-BlockSoil-nearby-water-lookup.patch} (100%) rename patches/server/{0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%) rename patches/server/{0644-Check-requirement-before-suggesting-root-nodes.patch => 0643-Check-requirement-before-suggesting-root-nodes.patch} (100%) rename patches/server/{0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%) rename patches/server/{0646-Add-packet-limiter-config.patch => 0645-Add-packet-limiter-config.patch} (100%) rename patches/server/{0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%) rename patches/server/{0648-Ensure-valid-vehicle-status.patch => 0647-Ensure-valid-vehicle-status.patch} (100%) rename patches/server/{0649-Prevent-softlocked-end-exit-portal-generation.patch => 0648-Prevent-softlocked-end-exit-portal-generation.patch} (100%) rename patches/server/{0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%) rename patches/server/{0651-Don-t-log-debug-logging-being-disabled.patch => 0650-Don-t-log-debug-logging-being-disabled.patch} (100%) rename patches/server/{0652-fix-various-menus-with-empty-level-accesses.patch => 0651-fix-various-menus-with-empty-level-accesses.patch} (100%) rename patches/server/{0653-Preserve-overstacked-loot.patch => 0652-Preserve-overstacked-loot.patch} (100%) rename patches/server/{0654-Update-head-rotation-in-missing-places.patch => 0653-Update-head-rotation-in-missing-places.patch} (93%) rename patches/server/{0655-prevent-unintended-light-block-manipulation.patch => 0654-prevent-unintended-light-block-manipulation.patch} (100%) rename patches/server/{0656-Fix-CraftCriteria-defaults-map.patch => 0655-Fix-CraftCriteria-defaults-map.patch} (100%) rename patches/server/{0657-Fix-upstreams-block-state-factories.patch => 0656-Fix-upstreams-block-state-factories.patch} (99%) rename patches/server/{0658-Configurable-feature-seeds.patch => 0657-Configurable-feature-seeds.patch} (100%) rename patches/server/{0659-Add-root-admin-user-detection.patch => 0658-Add-root-admin-user-detection.patch} (100%) rename patches/server/{0660-Always-allow-item-changing-in-Fireball.patch => 0659-Always-allow-item-changing-in-Fireball.patch} (100%) rename patches/server/{0661-don-t-attempt-to-teleport-dead-entities.patch => 0660-don-t-attempt-to-teleport-dead-entities.patch} (91%) rename patches/server/{0662-Prevent-excessive-velocity-through-repeated-crits.patch => 0661-Prevent-excessive-velocity-through-repeated-crits.patch} (100%) rename patches/server/{0663-Remove-client-side-code-using-deprecated-for-removal.patch => 0662-Remove-client-side-code-using-deprecated-for-removal.patch} (100%) rename patches/server/{0664-Fix-removing-recipes-from-RecipeIterator.patch => 0663-Fix-removing-recipes-from-RecipeIterator.patch} (100%) rename patches/server/{0665-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0664-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%) rename patches/server/{0666-Hide-unnecessary-itemmeta-from-clients.patch => 0665-Hide-unnecessary-itemmeta-from-clients.patch} (100%) rename patches/server/{0667-Fix-Spigot-growth-modifiers.patch => 0666-Fix-Spigot-growth-modifiers.patch} (100%) rename patches/server/{0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%) rename patches/server/{0669-Add-PlayerItemFrameChangeEvent.patch => 0668-Add-PlayerItemFrameChangeEvent.patch} (97%) rename patches/server/{0670-Optimize-HashMapPalette.patch => 0669-Optimize-HashMapPalette.patch} (100%) rename patches/server/{0671-Allow-delegation-to-vanilla-chunk-gen.patch => 0670-Allow-delegation-to-vanilla-chunk-gen.patch} (100%) rename patches/server/{0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%) rename patches/server/{0673-Add-more-Campfire-API.patch => 0672-Add-more-Campfire-API.patch} (100%) rename patches/server/{0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%) rename patches/server/{0675-Forward-CraftEntity-in-teleport-command.patch => 0674-Forward-CraftEntity-in-teleport-command.patch} (95%) rename patches/server/{0676-Improve-scoreboard-entries.patch => 0675-Improve-scoreboard-entries.patch} (100%) rename patches/server/{0677-Entity-powdered-snow-API.patch => 0676-Entity-powdered-snow-API.patch} (92%) rename patches/server/{0678-Add-API-for-item-entity-health.patch => 0677-Add-API-for-item-entity-health.patch} (100%) rename patches/server/{0679-Configurable-max-block-light-for-monster-spawning.patch => 0678-Configurable-max-block-light-for-monster-spawning.patch} (100%) rename patches/server/{0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%) rename patches/server/{0681-Load-effect-amplifiers-greater-than-127-correctly.patch => 0680-Load-effect-amplifiers-greater-than-127-correctly.patch} (100%) rename patches/server/{0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%) rename patches/server/{0683-Fix-bees-aging-inside-hives.patch => 0682-Fix-bees-aging-inside-hives.patch} (100%) rename patches/server/{0684-Bucketable-API.patch => 0683-Bucketable-API.patch} (100%) rename patches/server/{0685-Validate-usernames.patch => 0684-Validate-usernames.patch} (100%) rename patches/server/{0686-Make-water-animal-spawn-height-configurable.patch => 0685-Make-water-animal-spawn-height-configurable.patch} (100%) rename patches/server/{0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%) rename patches/server/{0688-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0687-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%) rename patches/server/{0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%) rename patches/server/{0690-Multiple-Entries-with-Scoreboards.patch => 0689-Multiple-Entries-with-Scoreboards.patch} (100%) rename patches/server/{0691-Reset-placed-block-on-exception.patch => 0690-Reset-placed-block-on-exception.patch} (100%) rename patches/server/{0692-Add-configurable-height-for-slime-spawn.patch => 0691-Add-configurable-height-for-slime-spawn.patch} (100%) rename patches/server/{0693-Fix-xp-reward-for-baby-zombies.patch => 0692-Fix-xp-reward-for-baby-zombies.patch} (100%) rename patches/server/{0694-Multi-Block-Change-API-Implementation.patch => 0693-Multi-Block-Change-API-Implementation.patch} (100%) rename patches/server/{0695-Fix-NotePlayEvent.patch => 0694-Fix-NotePlayEvent.patch} (100%) rename patches/server/{0696-Freeze-Tick-Lock-API.patch => 0695-Freeze-Tick-Lock-API.patch} (95%) rename patches/server/{0697-More-PotionEffectType-API.patch => 0696-More-PotionEffectType-API.patch} (100%) rename patches/server/{0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%) rename patches/server/{0699-API-for-creating-command-sender-which-forwards-feedb.patch => 0698-API-for-creating-command-sender-which-forwards-feedb.patch} (100%) rename patches/server/{0700-Add-missing-structure-set-seed-configs.patch => 0699-Add-missing-structure-set-seed-configs.patch} (100%) rename patches/server/{0701-Implement-regenerateChunk.patch => 0700-Implement-regenerateChunk.patch} (100%) rename patches/server/{0702-Fix-cancelled-powdered-snow-bucket-placement.patch => 0701-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%) rename patches/server/{0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%) rename patches/server/{0704-Add-GameEvent-tags.patch => 0703-Add-GameEvent-tags.patch} (100%) rename patches/server/{0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%) rename patches/server/{0706-Furnace-RecipesUsed-API.patch => 0705-Furnace-RecipesUsed-API.patch} (100%) rename patches/server/{0707-Configurable-sculk-sensor-listener-range.patch => 0706-Configurable-sculk-sensor-listener-range.patch} (100%) rename patches/server/{0708-Add-missing-block-data-mins-and-maxes.patch => 0707-Add-missing-block-data-mins-and-maxes.patch} (100%) rename patches/server/{0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%) rename patches/server/{0710-Put-world-into-worldlist-before-initing-the-world.patch => 0709-Put-world-into-worldlist-before-initing-the-world.patch} (100%) rename patches/server/{0711-Fix-Entity-Position-Desync.patch => 0710-Fix-Entity-Position-Desync.patch} (100%) rename patches/server/{0712-Custom-Potion-Mixes.patch => 0711-Custom-Potion-Mixes.patch} (100%) rename patches/server/{0713-Force-close-world-loading-screen.patch => 0712-Force-close-world-loading-screen.patch} (100%) rename patches/server/{0714-Fix-falling-block-spawn-methods.patch => 0713-Fix-falling-block-spawn-methods.patch} (100%) rename patches/server/{0715-Expose-furnace-minecart-push-values.patch => 0714-Expose-furnace-minecart-push-values.patch} (100%) rename patches/server/{0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%) rename patches/server/{0717-More-Projectile-API.patch => 0716-More-Projectile-API.patch} (97%) rename patches/server/{0718-Fix-swamp-hut-cat-generation-deadlock.patch => 0717-Fix-swamp-hut-cat-generation-deadlock.patch} (100%) rename patches/server/{0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%) rename patches/server/{0720-Implement-getComputedBiome-API.patch => 0719-Implement-getComputedBiome-API.patch} (100%) rename patches/server/{0721-Make-some-itemstacks-nonnull.patch => 0720-Make-some-itemstacks-nonnull.patch} (100%) rename patches/server/{0722-Implement-enchantWithLevels-API.patch => 0721-Implement-enchantWithLevels-API.patch} (100%) rename patches/server/{0723-Fix-saving-in-unloadWorld.patch => 0722-Fix-saving-in-unloadWorld.patch} (100%) rename patches/server/{0724-Buffer-OOB-setBlock-calls.patch => 0723-Buffer-OOB-setBlock-calls.patch} (100%) rename patches/server/{0725-Add-TameableDeathMessageEvent.patch => 0724-Add-TameableDeathMessageEvent.patch} (100%) rename patches/server/{0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%) rename patches/server/{0727-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0726-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%) rename patches/server/{0728-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0727-Ensure-entity-passenger-world-matches-ridden-entity.patch} (91%) rename patches/server/{0729-cache-resource-keys.patch => 0728-cache-resource-keys.patch} (100%) rename patches/server/{0730-Allow-changing-the-EnderDragon-podium.patch => 0729-Allow-changing-the-EnderDragon-podium.patch} (100%) rename patches/server/{0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%) rename patches/server/{0732-Prevent-tile-entity-copies-loading-chunks.patch => 0731-Prevent-tile-entity-copies-loading-chunks.patch} (100%) rename patches/server/{0733-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0732-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%) rename patches/server/{0734-Expand-PlayerItemDamageEvent.patch => 0733-Expand-PlayerItemDamageEvent.patch} (100%) rename patches/server/{0735-WorldCreator-keepSpawnLoaded.patch => 0734-WorldCreator-keepSpawnLoaded.patch} (100%) rename patches/server/{0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%) rename patches/server/{0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%) rename patches/server/{0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%) rename patches/server/{0739-Fire-CauldronLevelChange-on-initial-fill.patch => 0738-Fire-CauldronLevelChange-on-initial-fill.patch} (100%) rename patches/server/{0740-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0739-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%) rename patches/server/{0741-Add-PlayerStopUsingItemEvent.patch => 0740-Add-PlayerStopUsingItemEvent.patch} (100%) rename patches/server/{0742-Don-t-tick-markers.patch => 0741-Don-t-tick-markers.patch} (100%) rename patches/server/{0743-Expand-FallingBlock-API.patch => 0742-Expand-FallingBlock-API.patch} (100%) rename patches/server/{0744-Add-support-for-Proxy-Protocol.patch => 0743-Add-support-for-Proxy-Protocol.patch} (100%) rename patches/server/{0745-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0744-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%) rename patches/server/{0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%) rename patches/server/{0747-properly-read-and-store-sus-effect-duration.patch => 0746-properly-read-and-store-sus-effect-duration.patch} (100%) rename patches/server/{0748-Sanitize-sent-BlockEntity-NBT.patch => 0747-Sanitize-sent-BlockEntity-NBT.patch} (100%) rename patches/server/{0749-Disable-component-selector-resolving-in-books-by-def.patch => 0748-Disable-component-selector-resolving-in-books-by-def.patch} (100%) rename patches/server/{0750-Prevent-entity-loading-causing-async-lookups.patch => 0749-Prevent-entity-loading-causing-async-lookups.patch} (97%) rename patches/server/{0751-Throw-exception-on-world-create-while-being-ticked.patch => 0750-Throw-exception-on-world-create-while-being-ticked.patch} (100%) rename patches/server/{0752-Dont-resent-entity-on-art-update.patch => 0751-Dont-resent-entity-on-art-update.patch} (100%) rename patches/server/{0753-Add-WardenAngerChangeEvent.patch => 0752-Add-WardenAngerChangeEvent.patch} (100%) rename patches/server/{0754-Add-option-for-strict-advancement-dimension-checks.patch => 0753-Add-option-for-strict-advancement-dimension-checks.patch} (100%) rename patches/server/{0755-Add-missing-important-BlockStateListPopulator-method.patch => 0754-Add-missing-important-BlockStateListPopulator-method.patch} (100%) rename patches/server/{0756-Nameable-Banner-API.patch => 0755-Nameable-Banner-API.patch} (100%) rename patches/server/{0757-Don-t-broadcast-messages-to-command-blocks.patch => 0756-Don-t-broadcast-messages-to-command-blocks.patch} (100%) rename patches/server/{0758-Prevent-empty-items-from-being-added-to-world.patch => 0757-Prevent-empty-items-from-being-added-to-world.patch} (100%) rename patches/server/{0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%) rename patches/server/{0760-Add-Player-getFishHook.patch => 0759-Add-Player-getFishHook.patch} (100%) rename patches/server/{0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%) rename patches/server/{0762-Add-various-missing-EntityDropItemEvent-calls.patch => 0761-Add-various-missing-EntityDropItemEvent-calls.patch} (98%) rename patches/server/{0763-Fix-Bee-flower-NPE.patch => 0762-Fix-Bee-flower-NPE.patch} (100%) rename patches/server/{0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%) rename patches/server/{0765-More-Teleport-API.patch => 0764-More-Teleport-API.patch} (99%) rename patches/server/{0766-Add-EntityPortalReadyEvent.patch => 0765-Add-EntityPortalReadyEvent.patch} (95%) rename patches/server/{0767-Don-t-use-level-random-in-entity-constructors.patch => 0766-Don-t-use-level-random-in-entity-constructors.patch} (100%) rename patches/server/{0768-Send-block-entities-after-destroy-prediction.patch => 0767-Send-block-entities-after-destroy-prediction.patch} (100%) rename patches/server/{0769-Warn-on-plugins-accessing-faraway-chunks.patch => 0768-Warn-on-plugins-accessing-faraway-chunks.patch} (100%) rename patches/server/{0770-Custom-Chat-Completion-Suggestions-API.patch => 0769-Custom-Chat-Completion-Suggestions-API.patch} (100%) rename patches/server/{0771-Add-and-fix-missing-BlockFadeEvents.patch => 0770-Add-and-fix-missing-BlockFadeEvents.patch} (100%) rename patches/server/{0772-Collision-API.patch => 0771-Collision-API.patch} (90%) rename patches/server/{0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%) rename patches/server/{0774-Block-Ticking-API.patch => 0773-Block-Ticking-API.patch} (100%) rename patches/server/{0775-Add-Velocity-IP-Forwarding-Support.patch => 0774-Add-Velocity-IP-Forwarding-Support.patch} (100%) rename patches/server/{0776-Add-NamespacedKey-biome-methods.patch => 0775-Add-NamespacedKey-biome-methods.patch} (100%) rename patches/server/{0777-Fix-plugin-loggers-on-server-shutdown.patch => 0776-Fix-plugin-loggers-on-server-shutdown.patch} (96%) rename patches/server/{0778-Stop-large-look-changes-from-crashing-the-server.patch => 0777-Stop-large-look-changes-from-crashing-the-server.patch} (100%) rename patches/server/{0779-Fire-EntityChangeBlockEvent-in-more-places.patch => 0778-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%) rename patches/server/{0780-Missing-eating-regain-reason.patch => 0779-Missing-eating-regain-reason.patch} (100%) rename patches/server/{0781-Missing-effect-cause.patch => 0780-Missing-effect-cause.patch} (100%) rename patches/server/{0782-Added-byte-array-serialization-deserialization-for-P.patch => 0781-Added-byte-array-serialization-deserialization-for-P.patch} (100%) rename patches/server/{0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (97%) rename patches/server/{0784-Call-BlockPhysicsEvent-more-often.patch => 0783-Call-BlockPhysicsEvent-more-often.patch} (100%) rename patches/server/{0785-Configurable-chat-thread-limit.patch => 0784-Configurable-chat-thread-limit.patch} (100%) rename patches/server/{0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%) rename patches/server/{0787-fix-Jigsaw-block-kicking-user.patch => 0786-fix-Jigsaw-block-kicking-user.patch} (100%) rename patches/server/{0788-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0787-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%) rename patches/server/{0789-Add-getDrops-to-BlockState.patch => 0788-Add-getDrops-to-BlockState.patch} (100%) rename patches/server/{0790-Fix-a-bunch-of-vanilla-bugs.patch => 0789-Fix-a-bunch-of-vanilla-bugs.patch} (99%) rename patches/server/{0791-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0790-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%) rename patches/server/{0792-Fix-custom-piglin-loved-items.patch => 0791-Fix-custom-piglin-loved-items.patch} (100%) rename patches/server/{0793-EntityPickupItemEvent-fixes.patch => 0792-EntityPickupItemEvent-fixes.patch} (100%) rename patches/server/{0794-Correctly-handle-interactions-with-items-on-cooldown.patch => 0793-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%) rename patches/server/{0795-Add-PlayerInventorySlotChangeEvent.patch => 0794-Add-PlayerInventorySlotChangeEvent.patch} (100%) rename patches/server/{0796-Elder-Guardian-appearance-API.patch => 0795-Elder-Guardian-appearance-API.patch} (100%) rename patches/server/{0797-Allow-changing-bed-s-occupied-property.patch => 0796-Allow-changing-bed-s-occupied-property.patch} (100%) rename patches/server/{0798-Add-entity-knockback-API.patch => 0797-Add-entity-knockback-API.patch} (100%) rename patches/server/{0799-Detect-headless-JREs.patch => 0798-Detect-headless-JREs.patch} (100%) rename patches/server/{0800-fix-entity-vehicle-collision-event-not-called.patch => 0799-fix-entity-vehicle-collision-event-not-called.patch} (100%) rename patches/server/{0801-Add-EntityToggleSitEvent.patch => 0800-Add-EntityToggleSitEvent.patch} (100%) rename patches/server/{0802-Add-fire-tick-delay-option.patch => 0801-Add-fire-tick-delay-option.patch} (100%) rename patches/server/{0803-Add-Moving-Piston-API.patch => 0802-Add-Moving-Piston-API.patch} (100%) rename patches/server/{0804-Ignore-impossible-spawn-tick.patch => 0803-Ignore-impossible-spawn-tick.patch} (100%) rename patches/server/{0805-Track-projectile-source-for-fireworks-from-dispenser.patch => 0804-Track-projectile-source-for-fireworks-from-dispenser.patch} (100%) rename patches/server/{0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%) rename patches/server/{0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (95%) rename patches/server/{0808-Add-PrePlayerAttackEntityEvent.patch => 0807-Add-PrePlayerAttackEntityEvent.patch} (100%) rename patches/server/{0809-ensure-reset-EnderDragon-boss-event-name.patch => 0808-ensure-reset-EnderDragon-boss-event-name.patch} (100%) rename patches/server/{0810-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0809-fix-MC-252817-green-map-markers-do-not-disappear.patch} (94%) rename patches/server/{0811-Add-Player-Warden-Warning-API.patch => 0810-Add-Player-Warden-Warning-API.patch} (100%) rename patches/server/{0812-More-vanilla-friendly-methods-to-update-trades.patch => 0811-More-vanilla-friendly-methods-to-update-trades.patch} (100%) rename patches/server/{0813-Add-paper-dumplisteners-command.patch => 0812-Add-paper-dumplisteners-command.patch} (100%) rename patches/server/{0814-check-global-player-list-where-appropriate.patch => 0813-check-global-player-list-where-appropriate.patch} (100%) rename patches/server/{0815-Fix-async-entity-add-due-to-fungus-trees.patch => 0814-Fix-async-entity-add-due-to-fungus-trees.patch} (100%) rename patches/server/{0816-ItemStack-damage-API.patch => 0815-ItemStack-damage-API.patch} (100%) rename patches/server/{0817-Friction-API.patch => 0816-Friction-API.patch} (100%) rename patches/server/{0818-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0817-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%) rename patches/server/{0819-Fix-player-kick-on-shutdown.patch => 0818-Fix-player-kick-on-shutdown.patch} (100%) rename patches/server/{0820-Sync-offhand-slot-in-menus.patch => 0819-Sync-offhand-slot-in-menus.patch} (100%) rename patches/server/{0821-Player-Entity-Tracking-Events.patch => 0820-Player-Entity-Tracking-Events.patch} (96%) rename patches/server/{0822-Limit-pet-look-distance.patch => 0821-Limit-pet-look-distance.patch} (100%) rename patches/server/{0823-Fixes-and-additions-to-the-SpawnReason-API.patch => 0822-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%) rename patches/server/{0824-fix-Instruments.patch => 0823-fix-Instruments.patch} (100%) rename patches/server/{0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%) rename patches/server/{0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%) rename patches/server/{0827-Add-BlockLockCheckEvent.patch => 0826-Add-BlockLockCheckEvent.patch} (100%) rename patches/server/{0828-Add-Sneaking-API-for-Entities.patch => 0827-Add-Sneaking-API-for-Entities.patch} (91%) rename patches/server/{0829-Improve-logging-and-errors.patch => 0828-Improve-logging-and-errors.patch} (100%) rename patches/server/{0830-Improve-PortalEvents.patch => 0829-Improve-PortalEvents.patch} (93%) rename patches/server/{0831-Add-config-option-for-spider-worldborder-climbing.patch => 0830-Add-config-option-for-spider-worldborder-climbing.patch} (100%) rename patches/server/{0832-Add-missing-SpigotConfig-logCommands-check.patch => 0831-Add-missing-SpigotConfig-logCommands-check.patch} (100%) rename patches/server/{0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%) rename patches/server/{0834-Flying-Fall-Damage.patch => 0833-Flying-Fall-Damage.patch} (100%) rename patches/server/{0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%) rename patches/server/{0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (94%) rename patches/server/{0837-config-for-disabling-entity-tag-tags.patch => 0836-config-for-disabling-entity-tag-tags.patch} (100%) rename patches/server/{0838-Use-single-player-info-update-packet-on-join.patch => 0837-Use-single-player-info-update-packet-on-join.patch} (100%) rename patches/server/{0839-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0838-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%) rename patches/server/{0840-Win-Screen-API.patch => 0839-Win-Screen-API.patch} (100%) rename patches/server/{0841-Remove-CraftItemStack-setAmount-null-assignment.patch => 0840-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%) rename patches/server/{0842-Fix-force-opening-enchantment-tables.patch => 0841-Fix-force-opening-enchantment-tables.patch} (100%) rename patches/server/{0843-Add-Entity-Body-Yaw-API.patch => 0842-Add-Entity-Body-Yaw-API.patch} (94%) rename patches/server/{0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%) rename patches/server/{0845-Update-the-flag-when-a-captured-block-state-is-outda.patch => 0844-Update-the-flag-when-a-captured-block-state-is-outda.patch} (100%) rename patches/server/{0846-Add-EntityFertilizeEggEvent.patch => 0845-Add-EntityFertilizeEggEvent.patch} (100%) rename patches/server/{0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%) rename patches/server/{0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%) rename patches/server/{0849-Correctly-handle-ArmorStand-invisibility.patch => 0848-Correctly-handle-ArmorStand-invisibility.patch} (100%) rename patches/server/{0850-Fix-advancement-triggers-for-entity-damage.patch => 0849-Fix-advancement-triggers-for-entity-damage.patch} (100%) rename patches/server/{0851-Fix-text-display-error-on-spawn.patch => 0850-Fix-text-display-error-on-spawn.patch} (100%) rename patches/server/{0852-Fix-inventories-returning-null-Locations.patch => 0851-Fix-inventories-returning-null-Locations.patch} (100%) rename patches/server/{0853-Add-Shearable-API.patch => 0852-Add-Shearable-API.patch} (100%) rename patches/server/{0854-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0853-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%) rename patches/server/{0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%) rename patches/server/{0856-Treat-sequence-violations-like-they-should-be.patch => 0855-Treat-sequence-violations-like-they-should-be.patch} (100%) rename patches/server/{0857-remove-duplicate-animate-packet-for-records.patch => 0856-remove-duplicate-animate-packet-for-records.patch} (100%) rename patches/server/{0858-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0857-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%) rename patches/server/{0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%) rename patches/server/{0860-Use-array-for-gamerule-storage.patch => 0859-Use-array-for-gamerule-storage.patch} (100%) rename patches/server/{0861-Fix-a-couple-of-upstream-bed-issues.patch => 0860-Fix-a-couple-of-upstream-bed-issues.patch} (100%) rename patches/server/{0862-Fix-demo-flag-not-enabling-demo-mode.patch => 0861-Fix-demo-flag-not-enabling-demo-mode.patch} (100%) rename patches/server/{0863-Add-Mob-Experience-reward-API.patch => 0862-Add-Mob-Experience-reward-API.patch} (100%) rename patches/server/{0864-Break-redstone-on-top-of-trap-doors-early.patch => 0863-Break-redstone-on-top-of-trap-doors-early.patch} (100%) rename patches/server/{0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%) rename patches/server/{0866-More-accurate-isInOpenWater-impl.patch => 0865-More-accurate-isInOpenWater-impl.patch} (100%) rename patches/server/{0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch => 0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch} (100%) rename patches/server/{0868-Expand-PlayerItemMendEvent.patch => 0867-Expand-PlayerItemMendEvent.patch} (100%) rename patches/server/{0869-Refresh-ProjectileSource-for-projectiles.patch => 0868-Refresh-ProjectileSource-for-projectiles.patch} (97%) rename patches/server/{0870-Add-transient-modifier-API.patch => 0869-Add-transient-modifier-API.patch} (100%) rename patches/server/{0871-Fix-block-place-logic.patch => 0870-Fix-block-place-logic.patch} (100%) rename patches/server/{0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%) rename patches/server/{0873-Call-BlockGrowEvent-for-missing-blocks.patch => 0872-Call-BlockGrowEvent-for-missing-blocks.patch} (100%) rename patches/server/{0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%) rename patches/server/{0875-fix-MapLike-spam-for-missing-key-selector.patch => 0874-fix-MapLike-spam-for-missing-key-selector.patch} (100%) rename patches/server/{0876-Fix-sniffer-removeExploredLocation.patch => 0875-Fix-sniffer-removeExploredLocation.patch} (100%) rename patches/server/{0877-Add-method-to-remove-all-active-potion-effects.patch => 0876-Add-method-to-remove-all-active-potion-effects.patch} (91%) rename patches/server/{0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%) rename patches/server/{0879-Add-event-for-player-editing-sign.patch => 0878-Add-event-for-player-editing-sign.patch} (100%) rename patches/server/{0880-Only-tick-item-frames-if-players-can-see-it.patch => 0879-Only-tick-item-frames-if-players-can-see-it.patch} (100%) rename patches/server/{0881-Fix-cmd-permission-levels-for-command-blocks.patch => 0880-Fix-cmd-permission-levels-for-command-blocks.patch} (100%) rename patches/server/{0882-Add-option-to-disable-block-updates.patch => 0881-Add-option-to-disable-block-updates.patch} (100%) rename patches/server/{0883-Call-missing-BlockDispenseEvent.patch => 0882-Call-missing-BlockDispenseEvent.patch} (100%) rename patches/server/{0884-Don-t-load-chunks-for-supporting-block-checks.patch => 0883-Don-t-load-chunks-for-supporting-block-checks.patch} (90%) rename patches/server/{0885-Optimize-player-lookups-for-beacons.patch => 0884-Optimize-player-lookups-for-beacons.patch} (100%) rename patches/server/{0886-Add-Sign-getInteractableSideFor.patch => 0885-Add-Sign-getInteractableSideFor.patch} (100%) rename patches/server/{0887-Array-backed-synched-entity-data.patch => 0886-Array-backed-synched-entity-data.patch} (100%) rename patches/server/{0888-fix-item-meta-for-tadpole-buckets.patch => 0887-fix-item-meta-for-tadpole-buckets.patch} (100%) rename patches/server/{0889-Fix-BanList-API.patch => 0888-Fix-BanList-API.patch} (100%) rename patches/server/{0890-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0889-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%) rename patches/server/{0891-Fix-possible-NPE-on-painting-creation.patch => 0890-Fix-possible-NPE-on-painting-creation.patch} (100%) rename patches/server/{0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%) rename patches/server/{0893-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0892-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%) rename patches/server/{0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%) rename patches/server/{0895-Add-whitelist-events.patch => 0894-Add-whitelist-events.patch} (100%) rename patches/server/{0896-Implement-PlayerFailMoveEvent.patch => 0895-Implement-PlayerFailMoveEvent.patch} (100%) rename patches/server/{0897-Folia-scheduler-and-owned-region-API.patch => 0896-Folia-scheduler-and-owned-region-API.patch} (99%) rename patches/server/{0898-Only-erase-allay-memory-on-non-item-targets.patch => 0897-Only-erase-allay-memory-on-non-item-targets.patch} (100%) rename patches/server/{0899-API-for-updating-recipes-on-clients.patch => 0898-API-for-updating-recipes-on-clients.patch} (100%) rename patches/server/{0900-Fix-rotation-when-spawning-display-entities.patch => 0899-Fix-rotation-when-spawning-display-entities.patch} (100%) rename patches/server/{0901-Only-capture-actual-tree-growth.patch => 0900-Only-capture-actual-tree-growth.patch} (100%) rename patches/server/{0902-Use-correct-source-for-mushroom-block-spread-event.patch => 0901-Use-correct-source-for-mushroom-block-spread-event.patch} (100%) rename patches/server/{0903-Respect-randomizeData-on-more-entities-when-spawning.patch => 0902-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%) rename patches/server/{0904-Use-correct-seed-on-api-world-load.patch => 0903-Use-correct-seed-on-api-world-load.patch} (100%) rename patches/server/{0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%) rename patches/server/{0906-Cache-map-ids-on-item-frames.patch => 0905-Cache-map-ids-on-item-frames.patch} (96%) rename patches/server/{0907-Fix-custom-statistic-criteria-creation.patch => 0906-Fix-custom-statistic-criteria-creation.patch} (100%) rename patches/server/{0908-Bandaid-fix-for-Effect.patch => 0907-Bandaid-fix-for-Effect.patch} (100%) rename patches/server/{0909-SculkCatalyst-bloom-API.patch => 0908-SculkCatalyst-bloom-API.patch} (100%) rename patches/server/{0910-API-for-an-entity-s-scoreboard-name.patch => 0909-API-for-an-entity-s-scoreboard-name.patch} (86%) rename patches/server/{0911-Deprecate-and-replace-methods-with-old-StructureType.patch => 0910-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%) rename patches/server/{0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%) rename patches/server/{0913-Properly-handle-BlockBreakEvent-isDropItems.patch => 0912-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%) rename patches/server/{0914-Fire-entity-death-event-for-ender-dragon.patch => 0913-Fire-entity-death-event-for-ender-dragon.patch} (100%) rename patches/server/{0915-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0914-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%) rename patches/server/{0916-Add-Listing-API-for-Player.patch => 0915-Add-Listing-API-for-Player.patch} (100%) rename patches/server/{0917-Configurable-Region-Compression-Format.patch => 0916-Configurable-Region-Compression-Format.patch} (100%) rename patches/server/{0918-Add-BlockFace-to-BlockDamageEvent.patch => 0917-Add-BlockFace-to-BlockDamageEvent.patch} (100%) rename patches/server/{0919-Fix-NPE-on-Boat-getStatus.patch => 0918-Fix-NPE-on-Boat-getStatus.patch} (100%) rename patches/server/{0920-Expand-Pose-API.patch => 0919-Expand-Pose-API.patch} (91%) rename patches/server/{0921-More-DragonBattle-API.patch => 0920-More-DragonBattle-API.patch} (100%) rename patches/server/{0922-Deep-clone-unhandled-nbt-tags.patch => 0921-Deep-clone-unhandled-nbt-tags.patch} (100%) rename patches/server/{0923-Add-PlayerPickItemEvent.patch => 0922-Add-PlayerPickItemEvent.patch} (100%) rename patches/server/{0924-Allow-trident-custom-damage.patch => 0923-Allow-trident-custom-damage.patch} (100%) rename patches/server/{0925-Expose-hand-in-BlockCanBuildEvent.patch => 0924-Expose-hand-in-BlockCanBuildEvent.patch} (100%) rename patches/server/{0926-Optimize-nearest-structure-border-iteration.patch => 0925-Optimize-nearest-structure-border-iteration.patch} (100%) rename patches/server/{0927-Implement-OfflinePlayer-isConnected.patch => 0926-Implement-OfflinePlayer-isConnected.patch} (100%) rename patches/server/{0928-Fix-inventory-desync.patch => 0927-Fix-inventory-desync.patch} (100%) rename patches/server/{0929-Add-titleOverride-to-InventoryOpenEvent.patch => 0928-Add-titleOverride-to-InventoryOpenEvent.patch} (100%) rename patches/server/{0930-Configure-sniffer-egg-hatch-time.patch => 0929-Configure-sniffer-egg-hatch-time.patch} (100%) rename patches/server/{0931-Do-crystal-portal-proximity-check-before-entity-look.patch => 0930-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%) rename patches/server/{0932-Skip-POI-finding-if-stuck-in-vehicle.patch => 0931-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%) rename patches/server/{0933-Add-slot-sanity-checks-in-container-clicks.patch => 0932-Add-slot-sanity-checks-in-container-clicks.patch} (100%) rename patches/server/{0934-Call-BlockRedstoneEvents-for-lecterns.patch => 0933-Call-BlockRedstoneEvents-for-lecterns.patch} (100%) rename patches/server/{0935-Allow-proper-checking-of-empty-item-stacks.patch => 0934-Allow-proper-checking-of-empty-item-stacks.patch} (100%) rename patches/server/{0936-Fix-silent-equipment-change-for-mobs.patch => 0935-Fix-silent-equipment-change-for-mobs.patch} (100%) rename patches/server/{0937-Fix-spigot-s-Forced-Stats.patch => 0936-Fix-spigot-s-Forced-Stats.patch} (100%) rename patches/server/{0938-Add-missing-InventoryHolders-to-inventories.patch => 0937-Add-missing-InventoryHolders-to-inventories.patch} (100%) rename patches/server/{0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%) rename patches/server/{0940-Add-missing-logs-for-log-ips-config-option.patch => 0939-Add-missing-logs-for-log-ips-config-option.patch} (100%) rename patches/server/{0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch => 0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch} (100%) rename patches/server/{0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%) rename patches/server/{0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%) rename patches/server/{0944-Fix-team-sidebar-objectives-not-being-cleared.patch => 0943-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%) rename patches/server/{0945-Fix-missing-map-initialize-event-call.patch => 0944-Fix-missing-map-initialize-event-call.patch} (100%) rename patches/server/{0946-Update-entity-data-when-attaching-firework-to-entity.patch => 0945-Update-entity-data-when-attaching-firework-to-entity.patch} (100%) rename patches/server/{0947-Use-correct-variable-for-initializing-CraftLootTable.patch => 0946-Use-correct-variable-for-initializing-CraftLootTable.patch} (100%) rename patches/server/{0948-Fix-UnsafeValues-loadAdvancement.patch => 0947-Fix-UnsafeValues-loadAdvancement.patch} (100%) rename patches/server/{0949-Add-player-idle-duration-API.patch => 0948-Add-player-idle-duration-API.patch} (100%) rename patches/server/{0950-Don-t-check-if-we-can-see-non-visible-entities.patch => 0949-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%) rename patches/server/{0951-Fix-NPE-in-SculkBloomEvent-world-access.patch => 0950-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%) rename patches/server/{0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%) rename patches/server/{0953-Optimize-VarInts.patch => 0952-Optimize-VarInts.patch} (100%) rename patches/server/{0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%) rename patches/server/{0955-Add-predicate-for-blocks-when-raytracing.patch => 0954-Add-predicate-for-blocks-when-raytracing.patch} (100%) rename patches/server/{0956-Broadcast-take-item-packets-with-collector-as-source.patch => 0955-Broadcast-take-item-packets-with-collector-as-source.patch} (100%) rename patches/server/{0957-Expand-LingeringPotion-API.patch => 0956-Expand-LingeringPotion-API.patch} (100%) rename patches/server/{0958-Add-MaterialTagsTest.patch => 0957-Add-MaterialTagsTest.patch} (100%) rename patches/server/{0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%) rename patches/server/{0960-Add-hand-to-fish-event-for-all-player-interactions.patch => 0959-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%) rename patches/server/{0961-Fix-several-issues-with-EntityBreedEvent.patch => 0960-Fix-several-issues-with-EntityBreedEvent.patch} (100%) rename patches/server/{0962-Add-UUID-attribute-modifier-API.patch => 0961-Add-UUID-attribute-modifier-API.patch} (100%) rename patches/server/{0963-Fix-missing-event-call-for-entity-teleport-API.patch => 0962-Fix-missing-event-call-for-entity-teleport-API.patch} (93%) rename patches/server/{0964-Lazily-create-LootContext-for-criterions.patch => 0963-Lazily-create-LootContext-for-criterions.patch} (100%) rename patches/server/{0965-Don-t-fire-sync-events-during-worldgen.patch => 0964-Don-t-fire-sync-events-during-worldgen.patch} (99%) rename patches/server/{0966-Add-Structure-check-API.patch => 0965-Add-Structure-check-API.patch} (100%) rename patches/server/{0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%) rename patches/server/{0968-Restore-vanilla-entity-drops-behavior.patch => 0967-Restore-vanilla-entity-drops-behavior.patch} (99%) rename patches/server/{0969-Dont-resend-blocks-on-interactions.patch => 0968-Dont-resend-blocks-on-interactions.patch} (100%) rename patches/server/{0970-add-more-scoreboard-API.patch => 0969-add-more-scoreboard-API.patch} (100%) rename patches/server/{0971-Improve-Registry.patch => 0970-Improve-Registry.patch} (100%) rename patches/server/{0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%) rename patches/server/{0973-Add-experience-points-API.patch => 0972-Add-experience-points-API.patch} (100%) rename patches/server/{0974-Add-drops-to-shear-events.patch => 0973-Add-drops-to-shear-events.patch} (100%) rename patches/server/{0975-Add-PlayerShieldDisableEvent.patch => 0974-Add-PlayerShieldDisableEvent.patch} (100%) rename patches/server/{0976-Validate-ResourceLocation-in-NBT-reading.patch => 0975-Validate-ResourceLocation-in-NBT-reading.patch} (100%) rename patches/server/{0977-Properly-handle-experience-dropping-on-block-break.patch => 0976-Properly-handle-experience-dropping-on-block-break.patch} (100%) rename patches/server/{0978-Fixup-NamespacedKey-handling.patch => 0977-Fixup-NamespacedKey-handling.patch} (100%) rename patches/server/{0979-Expose-LootTable-of-DecoratedPot.patch => 0978-Expose-LootTable-of-DecoratedPot.patch} (100%) rename patches/server/{0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%) rename patches/server/{0981-Rewrite-dataconverter-system.patch => 0980-Rewrite-dataconverter-system.patch} (100%) rename patches/server/{0982-Starlight.patch => 0981-Starlight.patch} (100%) rename patches/server/{0983-Rewrite-chunk-system.patch => 0982-Rewrite-chunk-system.patch} (99%) rename patches/server/{0984-incremental-chunk-and-player-saving.patch => 0983-incremental-chunk-and-player-saving.patch} (100%) rename patches/server/{0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%) rename patches/server/{0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%) rename patches/server/{0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%) rename patches/server/{0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%) rename patches/server/{0989-Allow-Saving-of-Oversized-Chunks.patch => 0988-Allow-Saving-of-Oversized-Chunks.patch} (100%) rename patches/server/{0990-Fix-World-isChunkGenerated-calls.patch => 0989-Fix-World-isChunkGenerated-calls.patch} (100%) rename patches/server/{0991-Flat-bedrock-generator-settings.patch => 0990-Flat-bedrock-generator-settings.patch} (100%) rename patches/server/{0992-Entity-Activation-Range-2.0.patch => 0991-Entity-Activation-Range-2.0.patch} (99%) rename patches/server/{0993-Optional-per-player-mob-spawns.patch => 0992-Optional-per-player-mob-spawns.patch} (100%) rename patches/server/{0994-Anti-Xray.patch => 0993-Anti-Xray.patch} (100%) rename patches/server/{0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%) rename patches/server/{0996-Optimize-Collision-to-not-load-chunks.patch => 0995-Optimize-Collision-to-not-load-chunks.patch} (98%) rename patches/server/{0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%) rename patches/server/{0998-Entity-load-save-limit-per-chunk.patch => 0997-Entity-load-save-limit-per-chunk.patch} (100%) rename patches/server/{0999-Fix-and-optimise-world-force-upgrading.patch => 0998-Fix-and-optimise-world-force-upgrading.patch} (100%) rename patches/server/{1000-Improved-Watchdog-Support.patch => 0999-Improved-Watchdog-Support.patch} (100%) rename patches/server/{1001-Optimize-Voxel-Shape-Merging.patch => 1000-Optimize-Voxel-Shape-Merging.patch} (100%) rename patches/server/{1002-Write-SavedData-IO-async.patch => 1001-Write-SavedData-IO-async.patch} (100%) rename patches/server/{1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%) rename patches/server/{1004-Use-distance-map-to-optimise-entity-tracker.patch => 1003-Use-distance-map-to-optimise-entity-tracker.patch} (99%) rename patches/server/{1005-Optimize-Bit-Operations-by-inlining.patch => 1004-Optimize-Bit-Operations-by-inlining.patch} (100%) rename patches/server/{1006-Remove-streams-from-hot-code.patch => 1005-Remove-streams-from-hot-code.patch} (100%) rename patches/server/{1007-Eigencraft-redstone-implementation.patch => 1006-Eigencraft-redstone-implementation.patch} (100%) rename patches/server/{1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%) rename patches/server/{1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%) rename patches/server/{1010-Improve-boat-collision-performance.patch => 1009-Improve-boat-collision-performance.patch} (100%) rename patches/server/{1011-Optimise-general-POI-access.patch => 1010-Optimise-general-POI-access.patch} (100%) rename patches/server/{1012-Custom-table-implementation-for-blockstate-state-loo.patch => 1011-Custom-table-implementation-for-blockstate-state-loo.patch} (100%) rename patches/server/{1013-Execute-chunk-tasks-mid-tick.patch => 1012-Execute-chunk-tasks-mid-tick.patch} (100%) rename patches/server/{1014-Optimise-random-block-ticking.patch => 1013-Optimise-random-block-ticking.patch} (100%) rename patches/server/{1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%) rename patches/server/{1016-Use-Velocity-compression-and-cipher-natives.patch => 1015-Use-Velocity-compression-and-cipher-natives.patch} (100%) rename patches/server/{1017-Detail-more-information-in-watchdog-dumps.patch => 1016-Detail-more-information-in-watchdog-dumps.patch} (99%) rename patches/server/{1018-Collision-optimisations.patch => 1017-Collision-optimisations.patch} (99%) rename patches/server/{1019-Optimise-collision-checking-in-player-move-packet-ha.patch => 1018-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%) rename patches/server/{1020-Fix-tripwire-disarming-not-working-as-intended.patch => 1019-Fix-tripwire-disarming-not-working-as-intended.patch} (100%) rename patches/server/{1021-Fix-entity-type-tags-suggestions-in-selectors.patch => 1020-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%) rename patches/server/{1022-Add-Alternate-Current-redstone-implementation.patch => 1021-Add-Alternate-Current-redstone-implementation.patch} (100%) rename patches/server/{1023-optimize-dirt-and-snow-spreading.patch => 1022-optimize-dirt-and-snow-spreading.patch} (100%) rename patches/server/{1024-Properly-resend-entities.patch => 1023-Properly-resend-entities.patch} (99%) rename patches/server/{1025-Optimize-Hoppers.patch => 1024-Optimize-Hoppers.patch} (100%) rename patches/server/{1026-Improve-performance-of-mass-crafts.patch => 1025-Improve-performance-of-mass-crafts.patch} (100%) rename patches/server/{1027-Actually-optimise-explosions.patch => 1026-Actually-optimise-explosions.patch} (100%) rename patches/server/{1028-Optimise-chunk-tick-iteration.patch => 1027-Optimise-chunk-tick-iteration.patch} (100%) rename patches/server/{1029-Lag-compensation-ticks.patch => 1028-Lag-compensation-ticks.patch} (100%) rename patches/server/{1030-Optimise-nearby-player-retrieval.patch => 1029-Optimise-nearby-player-retrieval.patch} (100%) rename patches/server/{1031-Distance-manager-tick-timings.patch => 1030-Distance-manager-tick-timings.patch} (100%) rename patches/server/{1032-Handle-Oversized-block-entities-in-chunks.patch => 1031-Handle-Oversized-block-entities-in-chunks.patch} (100%) rename patches/server/{1033-Send-full-pos-packets-for-hard-colliding-entities.patch => 1032-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%) rename patches/server/{1034-Add-ShulkerDuplicateEvent.patch => 1033-Add-ShulkerDuplicateEvent.patch} (100%) rename patches/server/{1035-Add-api-for-spawn-egg-texture-colors.patch => 1034-Add-api-for-spawn-egg-texture-colors.patch} (100%) rename patches/server/{1036-Disable-memory-reserve-allocating.patch => 1035-Disable-memory-reserve-allocating.patch} (100%) rename patches/server/{1037-Improve-tag-parser-handling.patch => 1036-Improve-tag-parser-handling.patch} (100%) rename patches/server/{1038-Add-Lifecycle-Event-system.patch => 1037-Add-Lifecycle-Event-system.patch} (100%) rename patches/server/{1039-Conduit-API.patch => 1038-Conduit-API.patch} (100%) rename patches/server/{1040-ItemStack-Tooltip-API.patch => 1039-ItemStack-Tooltip-API.patch} (100%) rename patches/server/{1041-Fix-possible-StackOverflowError-for-some-dispenses.patch => 1040-Fix-possible-StackOverflowError-for-some-dispenses.patch} (100%) rename patches/server/{1042-Properly-track-the-changed-item-from-dispense-events.patch => 1041-Properly-track-the-changed-item-from-dispense-events.patch} (100%) rename patches/server/{1043-Add-getChunkSnapshot-includeLightData-parameter.patch => 1042-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%) rename patches/server/{1044-Add-FluidState-API.patch => 1043-Add-FluidState-API.patch} (100%) rename patches/server/{1045-add-number-format-api.patch => 1044-add-number-format-api.patch} (100%) rename patches/server/{1046-check-if-itemstack-is-stackable-first.patch => 1045-check-if-itemstack-is-stackable-first.patch} (100%) rename patches/server/{1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch => 1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch} (100%) rename patches/server/{1048-improve-BanList-types.patch => 1047-improve-BanList-types.patch} (100%) rename patches/server/{1049-Configurable-max-block-fluid-ticks.patch => 1048-Configurable-max-block-fluid-ticks.patch} (100%) rename patches/server/{1050-disable-forced-empty-world-ticks.patch => 1049-disable-forced-empty-world-ticks.patch} (100%) rename patches/server/{1051-Suspicious-Effect-Entry-API.patch => 1050-Suspicious-Effect-Entry-API.patch} (100%) rename patches/server/{1052-Per-world-ticks-per-spawn-settings.patch => 1051-Per-world-ticks-per-spawn-settings.patch} (100%) rename patches/server/{1053-Add-onboarding-message-for-initial-server-start.patch => 1052-Add-onboarding-message-for-initial-server-start.patch} (100%) rename patches/server/{1054-Fix-DamageSource-API.patch => 1053-Fix-DamageSource-API.patch} (99%) rename patches/server/{1055-Expanded-Hopper-API.patch => 1054-Expanded-Hopper-API.patch} (100%) diff --git a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0201-Improve-Arrow-API.patch b/patches/api/0201-Improve-Arrow-API.patch deleted file mode 100644 index 1c70418e9857..000000000000 --- a/patches/api/0201-Improve-Arrow-API.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nesaak <52047222+Nesaak@users.noreply.github.com> -Date: Fri, 22 May 2020 13:35:21 -0400 -Subject: [PATCH] Improve Arrow API - -Add method to get the arrow's itemstack and a method -to set the arrow's "noclip" status - -Co-authored-by: Jake Potrebic - -diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..225a24898acd25038ea2a8448f9f3b57643d3026 100644 ---- a/src/main/java/org/bukkit/entity/AbstractArrow.java -+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -143,6 +143,28 @@ public interface AbstractArrow extends Projectile { - } - - // Paper start -+ /** -+ * Gets the ItemStack for this arrow. -+ * -+ * @return The ItemStack, as if a player picked up the arrow -+ */ -+ @NotNull -+ org.bukkit.inventory.ItemStack getItemStack(); -+ -+ /** -+ * Sets this arrow to "noclip" status. -+ * -+ * @param noPhysics true to set "noclip" -+ */ -+ void setNoPhysics(boolean noPhysics); -+ -+ /** -+ * Gets if this arrow has "noclip". -+ * -+ * @return true if noclip is active -+ */ -+ boolean hasNoPhysics(); -+ - /** - * Gets the {@link PickupRule} for this arrow. - * diff --git a/patches/api/0203-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch similarity index 96% rename from patches/api/0203-Support-components-in-ItemMeta.patch rename to patches/api/0202-Support-components-in-ItemMeta.patch index 00f79422629d..dc804cc5b2f0 100644 --- a/patches/api/0203-Support-components-in-ItemMeta.patch +++ b/patches/api/0202-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 420a91a834016d3af95efd79ca92ae45c4f081c4..ea64d5b1ebaa652785ddbc7b515808174f636a62 100644 +index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08df7837a5d 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0205-Add-entity-liquid-API.patch b/patches/api/0204-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0205-Add-entity-liquid-API.patch rename to patches/api/0204-Add-entity-liquid-API.patch diff --git a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0207-Add-BellRingEvent.patch b/patches/api/0206-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0207-Add-BellRingEvent.patch rename to patches/api/0206-Add-BellRingEvent.patch diff --git a/patches/api/0208-Brand-support.patch b/patches/api/0207-Brand-support.patch similarity index 100% rename from patches/api/0208-Brand-support.patch rename to patches/api/0207-Brand-support.patch diff --git a/patches/api/0209-Add-moon-phase-API.patch b/patches/api/0208-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0209-Add-moon-phase-API.patch rename to patches/api/0208-Add-moon-phase-API.patch diff --git a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 93% rename from patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch index 2db07bbf4cc2..cc0b04bb45a6 100644 --- a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 3f062e0fe9cb632dece9ce3fdc985ab1bf5a425f..590d69f57722a40addf73131fa60e952f303230b 100644 +index 10d76fcd509702042c528fab96b963e9c6d210a5..3969f3c188211838cb576465bd64c0f63ae85080 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1045,5 +1045,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0211-Add-more-Evoker-API.patch b/patches/api/0210-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0211-Add-more-Evoker-API.patch rename to patches/api/0210-Add-more-Evoker-API.patch diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0211-Add-methods-to-get-translation-keys.patch similarity index 99% rename from patches/api/0212-Add-methods-to-get-translation-keys.patch rename to patches/api/0211-Add-methods-to-get-translation-keys.patch index f203ee5d2cbf..5af19e40306e 100644 --- a/patches/api/0212-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0211-Add-methods-to-get-translation-keys.patch @@ -282,7 +282,7 @@ index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80 + // Paper end } diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index a7c58adb6404e04a673bf91d491d7fef56dc890e..85a5e9a3b41798cb3cb6687ed379a5e3eedd698a 100644 +index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323eb592a15 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0216-Entity-isTicking.patch b/patches/api/0215-Entity-isTicking.patch similarity index 100% rename from patches/api/0216-Entity-isTicking.patch rename to patches/api/0215-Entity-isTicking.patch diff --git a/patches/api/0217-Villager-resetOffers.patch b/patches/api/0216-Villager-resetOffers.patch similarity index 100% rename from patches/api/0217-Villager-resetOffers.patch rename to patches/api/0216-Villager-resetOffers.patch diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0218-Player-elytra-boost-API.patch rename to patches/api/0217-Player-elytra-boost-API.patch diff --git a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0219-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0218-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0220-Add-ignore-discounts-API.patch b/patches/api/0219-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0220-Add-ignore-discounts-API.patch rename to patches/api/0219-Add-ignore-discounts-API.patch diff --git a/patches/api/0221-Item-no-age-no-player-pickup.patch b/patches/api/0220-Item-no-age-no-player-pickup.patch similarity index 93% rename from patches/api/0221-Item-no-age-no-player-pickup.patch rename to patches/api/0220-Item-no-age-no-player-pickup.patch index 5dd7572120f2..d3be2301afa1 100644 --- a/patches/api/0221-Item-no-age-no-player-pickup.patch +++ b/patches/api/0220-Item-no-age-no-player-pickup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index ab06c640cef1309ab44b0fae8d95df48cdc869a7..48858e1c58c13d786bbc935abedb0f059837833c 100644 +index bfecd0633458586c0352eeb1a95bb57b12f9101e..6239aec4f6c625a814fa4fd610cdc5ab1a9f6e0f 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -104,5 +104,34 @@ public interface Item extends Entity { diff --git a/patches/api/0222-Beacon-API-custom-effect-ranges.patch b/patches/api/0221-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0222-Beacon-API-custom-effect-ranges.patch rename to patches/api/0221-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0223-Add-API-for-quit-reason.patch b/patches/api/0222-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0223-Add-API-for-quit-reason.patch rename to patches/api/0222-Add-API-for-quit-reason.patch diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0223-Add-Destroy-Speed-API.patch similarity index 97% rename from patches/api/0224-Add-Destroy-Speed-API.patch rename to patches/api/0223-Add-Destroy-Speed-API.patch index d3bcb4752426..cdf304d00b5f 100644 --- a/patches/api/0224-Add-Destroy-Speed-API.patch +++ b/patches/api/0223-Add-Destroy-Speed-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 85a5e9a3b41798cb3cb6687ed379a5e3eedd698a..c1705e518af08841e8154caf183bc808366feb2e 100644 +index 1d3812db989a55b6f31bb30dffe70323eb592a15..4aea4be0677d93e17a4ce98dd340dd9921f996a0 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -690,4 +690,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch similarity index 90% rename from patches/api/0225-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0224-Add-LivingEntity-clearActiveItem.patch index efb08addcb37..aa60fb7335d5 100644 --- a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 590d69f57722a40addf73131fa60e952f303230b..191a3c3ee46649d2a539597258485752b34fac02 100644 +index 3969f3c188211838cb576465bd64c0f63ae85080..9d58da4686a22893455b9cc75fb8e73a87d2d06d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -996,6 +996,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0226-Add-PlayerItemCooldownEvent.patch b/patches/api/0225-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0226-Add-PlayerItemCooldownEvent.patch rename to patches/api/0225-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0227-More-lightning-API.patch b/patches/api/0226-More-lightning-API.patch similarity index 100% rename from patches/api/0227-More-lightning-API.patch rename to patches/api/0226-More-lightning-API.patch diff --git a/patches/api/0228-Add-PlayerShearBlockEvent.patch b/patches/api/0227-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0228-Add-PlayerShearBlockEvent.patch rename to patches/api/0227-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch b/patches/api/0228-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0229-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0228-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch similarity index 95% rename from patches/api/0230-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0229-Expose-LivingEntity-hurt-direction.patch index 948b10631fa8..e99a7ce6bb8e 100644 --- a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch @@ -26,7 +26,7 @@ index 94f2c3167f4ce7f5f2b4ecc067739c64af0a2508..4054d2c836342f0e4bcbd33adb13f50d * Get the sleep ticks of the player. This value may be capped. * diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 191a3c3ee46649d2a539597258485752b34fac02..62d0d2fe3c6dfc9faaa821bde074b623914e4a44 100644 +index 9d58da4686a22893455b9cc75fb8e73a87d2d06d..e9919fce380ec1d0d48b3ac706e7fd31af0be26b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1075,5 +1075,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0232-Added-PlayerTradeEvent.patch b/patches/api/0231-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0232-Added-PlayerTradeEvent.patch rename to patches/api/0231-Added-PlayerTradeEvent.patch diff --git a/patches/api/0233-Add-TargetHitEvent-API.patch b/patches/api/0232-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0233-Add-TargetHitEvent-API.patch rename to patches/api/0232-Add-TargetHitEvent-API.patch diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0233-Additional-Block-Material-API-s.patch similarity index 95% rename from patches/api/0234-Additional-Block-Material-API-s.patch rename to patches/api/0233-Additional-Block-Material-API-s.patch index f20f4d9d39e7..ab3e6f9ac6c3 100644 --- a/patches/api/0234-Additional-Block-Material-API-s.patch +++ b/patches/api/0233-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 137a40c708bb67de4608447975867a07240ddc88..3fd364e5875f95296e75dede4c610d3dd3e0038e 100644 +index 4aea4be0677d93e17a4ce98dd340dd9921f996a0..c68ed7de2d50da4105dd38c0986f237e8c56b2d6 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -439,6 +439,42 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0237-Zombie-API-breaking-doors.patch b/patches/api/0236-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0237-Zombie-API-breaking-doors.patch rename to patches/api/0236-Zombie-API-breaking-doors.patch diff --git a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch b/patches/api/0237-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0238-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0237-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch b/patches/api/0238-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0239-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0238-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch b/patches/api/0239-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0240-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0239-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0241-Add-BlockFailedDispenseEvent.patch b/patches/api/0240-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0241-Add-BlockFailedDispenseEvent.patch rename to patches/api/0240-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0242-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0241-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0245-Add-sendOpLevel-API.patch rename to patches/api/0244-Add-sendOpLevel-API.patch diff --git a/patches/api/0246-Add-PaperRegistry.patch b/patches/api/0245-Add-PaperRegistry.patch similarity index 100% rename from patches/api/0246-Add-PaperRegistry.patch rename to patches/api/0245-Add-PaperRegistry.patch diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0246-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0247-Add-StructuresLocateEvent.patch rename to patches/api/0246-Add-StructuresLocateEvent.patch diff --git a/patches/api/0248-Add-BlockPreDispenseEvent.patch b/patches/api/0247-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0248-Add-BlockPreDispenseEvent.patch rename to patches/api/0247-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0252-add-DragonEggFormEvent.patch b/patches/api/0251-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0252-add-DragonEggFormEvent.patch rename to patches/api/0251-add-DragonEggFormEvent.patch diff --git a/patches/api/0253-EntityMoveEvent.patch b/patches/api/0252-EntityMoveEvent.patch similarity index 100% rename from patches/api/0253-EntityMoveEvent.patch rename to patches/api/0252-EntityMoveEvent.patch diff --git a/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0256-living-entity-allow-attribute-registration.patch b/patches/api/0255-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0256-living-entity-allow-attribute-registration.patch rename to patches/api/0255-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0257-Add-missing-effects.patch b/patches/api/0256-Add-missing-effects.patch similarity index 100% rename from patches/api/0257-Add-missing-effects.patch rename to patches/api/0256-Add-missing-effects.patch diff --git a/patches/api/0258-Expose-Tracked-Players.patch b/patches/api/0257-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0258-Expose-Tracked-Players.patch rename to patches/api/0257-Expose-Tracked-Players.patch diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0258-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0259-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0258-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0260-Add-worldborder-events.patch b/patches/api/0259-Add-worldborder-events.patch similarity index 100% rename from patches/api/0260-Add-worldborder-events.patch rename to patches/api/0259-Add-worldborder-events.patch diff --git a/patches/api/0261-added-PlayerNameEntityEvent.patch b/patches/api/0260-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0261-added-PlayerNameEntityEvent.patch rename to patches/api/0260-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0262-Add-recipe-to-cook-events.patch b/patches/api/0261-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0262-Add-recipe-to-cook-events.patch rename to patches/api/0261-Add-recipe-to-cook-events.patch diff --git a/patches/api/0263-Add-Block-isValidTool.patch b/patches/api/0262-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0263-Add-Block-isValidTool.patch rename to patches/api/0262-Add-Block-isValidTool.patch diff --git a/patches/api/0264-Expand-world-key-API.patch b/patches/api/0263-Expand-world-key-API.patch similarity index 100% rename from patches/api/0264-Expand-world-key-API.patch rename to patches/api/0263-Expand-world-key-API.patch diff --git a/patches/api/0265-Item-Rarity-API.patch b/patches/api/0264-Item-Rarity-API.patch similarity index 100% rename from patches/api/0265-Item-Rarity-API.patch rename to patches/api/0264-Item-Rarity-API.patch diff --git a/patches/api/0266-Expose-protocol-version.patch b/patches/api/0265-Expose-protocol-version.patch similarity index 100% rename from patches/api/0266-Expose-protocol-version.patch rename to patches/api/0265-Expose-protocol-version.patch diff --git a/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0270-Added-PlayerDeepSleepEvent.patch b/patches/api/0269-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0270-Added-PlayerDeepSleepEvent.patch rename to patches/api/0269-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0271-More-World-API.patch b/patches/api/0270-More-World-API.patch similarity index 100% rename from patches/api/0271-More-World-API.patch rename to patches/api/0270-More-World-API.patch diff --git a/patches/api/0272-Added-PlayerBedFailEnterEvent.patch b/patches/api/0271-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0272-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0271-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0273-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0272-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0274-PlayerMoveEvent-Improvements.patch b/patches/api/0273-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0274-PlayerMoveEvent-Improvements.patch rename to patches/api/0273-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0276-Add-more-WanderingTrader-API.patch b/patches/api/0275-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0276-Add-more-WanderingTrader-API.patch rename to patches/api/0275-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0277-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0276-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0279-Inventory-close.patch b/patches/api/0278-Inventory-close.patch similarity index 100% rename from patches/api/0279-Inventory-close.patch rename to patches/api/0278-Inventory-close.patch diff --git a/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0281-Add-basic-Datapack-API.patch b/patches/api/0280-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0281-Add-basic-Datapack-API.patch rename to patches/api/0280-Add-basic-Datapack-API.patch diff --git a/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0283-ItemStack-repair-check-API.patch b/patches/api/0282-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0283-ItemStack-repair-check-API.patch rename to patches/api/0282-ItemStack-repair-check-API.patch diff --git a/patches/api/0284-More-Enchantment-API.patch b/patches/api/0283-More-Enchantment-API.patch similarity index 100% rename from patches/api/0284-More-Enchantment-API.patch rename to patches/api/0283-More-Enchantment-API.patch diff --git a/patches/api/0285-Add-Mob-lookAt-API.patch b/patches/api/0284-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0285-Add-Mob-lookAt-API.patch rename to patches/api/0284-Add-Mob-lookAt-API.patch diff --git a/patches/api/0286-ItemStack-editMeta.patch b/patches/api/0285-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0286-ItemStack-editMeta.patch rename to patches/api/0285-ItemStack-editMeta.patch diff --git a/patches/api/0287-Add-EntityInsideBlockEvent.patch b/patches/api/0286-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0287-Add-EntityInsideBlockEvent.patch rename to patches/api/0286-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0288-Attributes-API-for-item-defaults.patch b/patches/api/0287-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0288-Attributes-API-for-item-defaults.patch rename to patches/api/0287-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0290-More-Lidded-Block-API.patch b/patches/api/0289-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0290-More-Lidded-Block-API.patch rename to patches/api/0289-More-Lidded-Block-API.patch diff --git a/patches/api/0291-Add-PlayerKickEvent-causes.patch b/patches/api/0290-Add-PlayerKickEvent-causes.patch similarity index 97% rename from patches/api/0291-Add-PlayerKickEvent-causes.patch rename to patches/api/0290-Add-PlayerKickEvent-causes.patch index 39657e4039d0..b23128c57d90 100644 --- a/patches/api/0291-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0290-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 59821aba66edbef2644bdd21646f556e773a898b..793df7533096efb0f60bddcb3e4e1575cbcc1069 100644 +index d735ed635022d170c6b1080ed87f3c2a799202f6..4906bec154d0f60420fbe2cffa8c7df0918ca61b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -277,6 +277,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0292-Add-PufferFishStateChangeEvent.patch b/patches/api/0291-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0292-Add-PufferFishStateChangeEvent.patch rename to patches/api/0291-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0293-Add-BellRevealRaiderEvent.patch b/patches/api/0292-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0293-Add-BellRevealRaiderEvent.patch rename to patches/api/0292-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0294-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0293-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0295-Add-more-line-of-sight-methods.patch b/patches/api/0294-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0295-Add-more-line-of-sight-methods.patch rename to patches/api/0294-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0296-Add-WaterBottleSplashEvent.patch b/patches/api/0295-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0296-Add-WaterBottleSplashEvent.patch rename to patches/api/0295-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0297-Add-more-LimitedRegion-API.patch b/patches/api/0296-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0297-Add-more-LimitedRegion-API.patch rename to patches/api/0296-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0297-Missing-Entity-API.patch similarity index 98% rename from patches/api/0298-Missing-Entity-API.patch rename to patches/api/0297-Missing-Entity-API.patch index 1a3f1b5e632d..f9455519bbba 100644 --- a/patches/api/0298-Missing-Entity-API.patch +++ b/patches/api/0297-Missing-Entity-API.patch @@ -11,6 +11,7 @@ Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki Co-authored-by: FireInstall +Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java new file mode 100644 @@ -416,14 +417,14 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dcd20f180f 100644 +index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..578c22b0aef9c89a3c33b75c33bcdc60bdab6b49 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -283,6 +283,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isFrozen(); -+ // Paper start - move invisibility up to Entity ++ // Paper start - missing entity api + /** + * Sets whether the entity is invisible or not. + *

@@ -433,15 +434,29 @@ index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dc + * + * @param invisible If the entity is invisible + */ -+ void setInvisible(boolean invisible); ++ void setInvisible(boolean invisible); // Paper - moved up from LivingEntity + + /** + * Gets whether the entity is invisible or not. + * + * @return Whether the entity is invisible + */ -+ boolean isInvisible(); -+ // Paper end - move invisibility up to Entity ++ boolean isInvisible(); // Paper - moved up from LivingEntity ++ ++ /** ++ * Sets this entities no physics status. ++ * ++ * @param noPhysics boolean indicating if the entity should not have physics. ++ */ ++ void setNoPhysics(boolean noPhysics); ++ ++ /** ++ * Gets if this entity has no physics. ++ * ++ * @return true if the entity does not have physics. ++ */ ++ boolean hasNoPhysics(); ++ // Paper end - missing entity api + /** * Mark the entity's removal. diff --git a/patches/api/0299-Adds-PlayerArmSwingEvent.patch b/patches/api/0298-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0299-Adds-PlayerArmSwingEvent.patch rename to patches/api/0298-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0301-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0300-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0302-Stinger-API.patch b/patches/api/0301-Stinger-API.patch similarity index 95% rename from patches/api/0302-Stinger-API.patch rename to patches/api/0301-Stinger-API.patch index d2dc349f905d..4966f6d22804 100644 --- a/patches/api/0302-Stinger-API.patch +++ b/patches/api/0301-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 6e6b80843a8669b422f93e98343e1da9f8546ee7..d083cffe0b61642bf4c4ea0fecc529090702042f 100644 +index ff89fc699b7aaba982c59ace4effaffc5285ca17..41ca8fea2aede178bdbe87c05588bce4f2faf8e6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -419,6 +419,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0304-Add-PlayerSetSpawnEvent.patch b/patches/api/0303-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0304-Add-PlayerSetSpawnEvent.patch rename to patches/api/0303-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0305-Added-EntityDamageItemEvent.patch b/patches/api/0304-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0305-Added-EntityDamageItemEvent.patch rename to patches/api/0304-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0306-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0305-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0308-Add-BlockBreakBlockEvent.patch b/patches/api/0307-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0308-Add-BlockBreakBlockEvent.patch rename to patches/api/0307-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/api/0311-More-CommandBlock-API.patch b/patches/api/0310-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0311-More-CommandBlock-API.patch rename to patches/api/0310-More-CommandBlock-API.patch diff --git a/patches/api/0312-Add-missing-team-sidebar-display-slots.patch b/patches/api/0311-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0312-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0311-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0313-add-back-EntityPortalExitEvent.patch b/patches/api/0312-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0313-add-back-EntityPortalExitEvent.patch rename to patches/api/0312-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0315-Get-entity-default-attributes.patch b/patches/api/0314-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0315-Get-entity-default-attributes.patch rename to patches/api/0314-Get-entity-default-attributes.patch diff --git a/patches/api/0316-Left-handed-API.patch b/patches/api/0315-Left-handed-API.patch similarity index 100% rename from patches/api/0316-Left-handed-API.patch rename to patches/api/0315-Left-handed-API.patch diff --git a/patches/api/0317-Add-critical-damage-API.patch b/patches/api/0316-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0317-Add-critical-damage-API.patch rename to patches/api/0316-Add-critical-damage-API.patch diff --git a/patches/api/0318-Add-more-advancement-API.patch b/patches/api/0317-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0318-Add-more-advancement-API.patch rename to patches/api/0317-Add-more-advancement-API.patch diff --git a/patches/api/0319-Fix-issues-with-mob-conversion.patch b/patches/api/0318-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0319-Fix-issues-with-mob-conversion.patch rename to patches/api/0318-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0320-Add-isCollidable-methods-to-various-places.patch b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0320-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0319-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0321-Goat-ram-API.patch b/patches/api/0320-Goat-ram-API.patch similarity index 100% rename from patches/api/0321-Goat-ram-API.patch rename to patches/api/0320-Goat-ram-API.patch diff --git a/patches/api/0322-Add-API-for-resetting-a-single-score.patch b/patches/api/0321-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0322-Add-API-for-resetting-a-single-score.patch rename to patches/api/0321-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch similarity index 94% rename from patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch index f378113a44ad..0f3a5bae4ef5 100644 --- a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch @@ -24,10 +24,10 @@ index 434fde52986ba07d7209ff47483f74fe31e8ebe7..0c7204e390f44b649fc26cd46152abeb * Creates and returns the next EntityId available. *

diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index efe812b4d47df6f8b5ba54ec4526f3dcd20f180f..a09640dce6f61f808f516f5569e08e9e6a2f2b53 100644 +index 9272c15619f623dc39d9c9046fd6463674c37264..9cb84eababf159b04618a605ff03cdaee72c9502 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -911,5 +911,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -925,5 +925,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Deprecated @NotNull Set getTrackedPlayers(); diff --git a/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0324-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0323-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0326-Add-more-Campfire-API.patch b/patches/api/0325-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0326-Add-more-Campfire-API.patch rename to patches/api/0325-Add-more-Campfire-API.patch diff --git a/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch similarity index 100% rename from patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch rename to patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch diff --git a/patches/api/0328-Improve-scoreboard-entries.patch b/patches/api/0327-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0328-Improve-scoreboard-entries.patch rename to patches/api/0327-Improve-scoreboard-entries.patch diff --git a/patches/api/0329-Entity-powdered-snow-API.patch b/patches/api/0328-Entity-powdered-snow-API.patch similarity index 90% rename from patches/api/0329-Entity-powdered-snow-API.patch rename to patches/api/0328-Entity-powdered-snow-API.patch index b5b1dbedbdaf..2b48461850cd 100644 --- a/patches/api/0329-Entity-powdered-snow-API.patch +++ b/patches/api/0328-Entity-powdered-snow-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a09640dce6f61f808f516f5569e08e9e6a2f2b53..336cd1830182d4aac0fc7b5be629da4fc78c5cf8 100644 +index 9cb84eababf159b04618a605ff03cdaee72c9502..a7b37ba26d8999a78a747fe5a41e15327ae3a2ee 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -938,5 +938,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -952,5 +952,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return Whether the entity was successfully spawned. */ public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason); diff --git a/patches/api/0330-Add-API-for-item-entity-health.patch b/patches/api/0329-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0330-Add-API-for-item-entity-health.patch rename to patches/api/0329-Add-API-for-item-entity-health.patch diff --git a/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0332-Bucketable-API.patch b/patches/api/0331-Bucketable-API.patch similarity index 100% rename from patches/api/0332-Bucketable-API.patch rename to patches/api/0331-Bucketable-API.patch diff --git a/patches/api/0333-System-prop-for-default-config-comment-parsing.patch b/patches/api/0332-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0333-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0332-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0335-Multiple-Entries-with-Scoreboards.patch b/patches/api/0334-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0335-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0334-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0336-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0335-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0337-Multi-Block-Change-API.patch b/patches/api/0336-Multi-Block-Change-API.patch similarity index 95% rename from patches/api/0337-Multi-Block-Change-API.patch rename to patches/api/0336-Multi-Block-Change-API.patch index 45664f22b3be..8aa5be5a5c91 100644 --- a/patches/api/0337-Multi-Block-Change-API.patch +++ b/patches/api/0336-Multi-Block-Change-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 793df7533096efb0f60bddcb3e4e1575cbcc1069..c8a50647d34c70bc927c33c602f938a01bf6e7a9 100644 +index 4906bec154d0f60420fbe2cffa8c7df0918ca61b..2501533048e4de25672d9cc0a52fa1150e6d8adb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -895,6 +895,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0338-Fix-NotePlayEvent.patch b/patches/api/0337-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0338-Fix-NotePlayEvent.patch rename to patches/api/0337-Fix-NotePlayEvent.patch diff --git a/patches/api/0339-Freeze-Tick-Lock-API.patch b/patches/api/0338-Freeze-Tick-Lock-API.patch similarity index 81% rename from patches/api/0339-Freeze-Tick-Lock-API.patch rename to patches/api/0338-Freeze-Tick-Lock-API.patch index ae7c328cc6e4..f7ef909291c9 100644 --- a/patches/api/0339-Freeze-Tick-Lock-API.patch +++ b/patches/api/0338-Freeze-Tick-Lock-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 336cd1830182d4aac0fc7b5be629da4fc78c5cf8..5be7daff9077f35aa1d3abf747f7d147a1532b55 100644 +index a7b37ba26d8999a78a747fe5a41e15327ae3a2ee..9b5fe55399594c57c1b1521bea03781fd99fdf60 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -303,6 +303,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent - boolean isInvisible(); - // Paper end - move invisibility up to Entity +@@ -317,6 +317,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent + boolean hasNoPhysics(); + // Paper end - missing entity api + // Paper start - Freeze Tick Lock API + /** diff --git a/patches/api/0340-Dolphin-API.patch b/patches/api/0339-Dolphin-API.patch similarity index 100% rename from patches/api/0340-Dolphin-API.patch rename to patches/api/0339-Dolphin-API.patch diff --git a/patches/api/0341-More-PotionEffectType-API.patch b/patches/api/0340-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0341-More-PotionEffectType-API.patch rename to patches/api/0340-More-PotionEffectType-API.patch diff --git a/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/api/0343-Implement-regenerateChunk.patch b/patches/api/0342-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0343-Implement-regenerateChunk.patch rename to patches/api/0342-Implement-regenerateChunk.patch diff --git a/patches/api/0344-Add-GameEvent-tags.patch b/patches/api/0343-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0344-Add-GameEvent-tags.patch rename to patches/api/0343-Add-GameEvent-tags.patch diff --git a/patches/api/0345-Furnace-RecipesUsed-API.patch b/patches/api/0344-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0345-Furnace-RecipesUsed-API.patch rename to patches/api/0344-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0346-Configurable-sculk-sensor-listener-range.patch b/patches/api/0345-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0346-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0345-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0347-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0346-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0348-Custom-Potion-Mixes.patch b/patches/api/0347-Custom-Potion-Mixes.patch similarity index 100% rename from patches/api/0348-Custom-Potion-Mixes.patch rename to patches/api/0347-Custom-Potion-Mixes.patch diff --git a/patches/api/0349-Expose-furnace-minecart-push-values.patch b/patches/api/0348-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0349-Expose-furnace-minecart-push-values.patch rename to patches/api/0348-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0350-More-Projectile-API.patch b/patches/api/0349-More-Projectile-API.patch similarity index 97% rename from patches/api/0350-More-Projectile-API.patch rename to patches/api/0349-More-Projectile-API.patch index 569c337346a8..dcad065186e4 100644 --- a/patches/api/0350-More-Projectile-API.patch +++ b/patches/api/0349-More-Projectile-API.patch @@ -6,13 +6,22 @@ Subject: [PATCH] More Projectile API Co-authored-by: Nassim Jahnke diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce221ec474 100644 +index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..2d7521b71ec16e1b229bbe4c05d51673720df475 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -151,6 +151,36 @@ public interface AbstractArrow extends Projectile { - @NotNull - org.bukkit.inventory.ItemStack getItemStack(); - +@@ -174,5 +174,43 @@ public interface AbstractArrow extends Projectile { + ALLOWED, + CREATIVE_ONLY; + } ++ ++ /** ++ * Gets the ItemStack for this arrow. ++ * ++ * @return The ItemStack, as if a player picked up the arrow ++ */ ++ @NotNull ++ org.bukkit.inventory.ItemStack getItemStack(); ++ + /** + * Sets the amount of ticks this arrow has been alive in the world + * This is used to determine when the arrow should be automatically despawned. @@ -42,10 +51,8 @@ index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce + * @param sound sound that is played + */ + void setHitSound(@NotNull org.bukkit.Sound sound); -+ - /** - * Sets this arrow to "noclip" status. - * + // Paper end + } diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..217d348ad0bbef720b25d3b507a55ca8105b7731 100644 --- a/src/main/java/org/bukkit/entity/Firework.java diff --git a/patches/api/0351-Add-getComputedBiome-API.patch b/patches/api/0350-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0351-Add-getComputedBiome-API.patch rename to patches/api/0350-Add-getComputedBiome-API.patch diff --git a/patches/api/0352-Add-enchantWithLevels-API.patch b/patches/api/0351-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0352-Add-enchantWithLevels-API.patch rename to patches/api/0351-Add-enchantWithLevels-API.patch diff --git a/patches/api/0353-Add-TameableDeathMessageEvent.patch b/patches/api/0352-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0353-Add-TameableDeathMessageEvent.patch rename to patches/api/0352-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0357-WorldCreator-keepSpawnLoaded.patch b/patches/api/0356-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0357-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0356-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0359-Add-PlayerStopUsingItemEvent.patch b/patches/api/0358-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0359-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0358-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0360-Expand-FallingBlock-API.patch b/patches/api/0359-Expand-FallingBlock-API.patch similarity index 100% rename from patches/api/0360-Expand-FallingBlock-API.patch rename to patches/api/0359-Expand-FallingBlock-API.patch diff --git a/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 100% rename from patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch diff --git a/patches/api/0362-Add-WardenAngerChangeEvent.patch b/patches/api/0361-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0362-Add-WardenAngerChangeEvent.patch rename to patches/api/0361-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0363-Nameable-Banner-API.patch b/patches/api/0362-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0363-Nameable-Banner-API.patch rename to patches/api/0362-Nameable-Banner-API.patch diff --git a/patches/api/0364-Add-Player-getFishHook.patch b/patches/api/0363-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0364-Add-Player-getFishHook.patch rename to patches/api/0363-Add-Player-getFishHook.patch diff --git a/patches/api/0365-More-Teleport-API.patch b/patches/api/0364-More-Teleport-API.patch similarity index 99% rename from patches/api/0365-More-Teleport-API.patch rename to patches/api/0364-More-Teleport-API.patch index e3595a194794..f158c47e4e6c 100644 --- a/patches/api/0365-More-Teleport-API.patch +++ b/patches/api/0364-More-Teleport-API.patch @@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5 + +} diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7..948d6a08ff459afd5d4d5b151c41d94d1d5847b6 100644 +index 9b5fe55399594c57c1b1521bea03781fd99fdf60..e2f315db8d137d7bc1b6fc83ed29032152f881f2 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0366-Add-EntityPortalReadyEvent.patch b/patches/api/0365-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0366-Add-EntityPortalReadyEvent.patch rename to patches/api/0365-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0368-Collision-API.patch b/patches/api/0367-Collision-API.patch similarity index 92% rename from patches/api/0368-Collision-API.patch rename to patches/api/0367-Collision-API.patch index 61881abf50dc..b7bf3a1ae3f5 100644 --- a/patches/api/0368-Collision-API.patch +++ b/patches/api/0367-Collision-API.patch @@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97 // Paper end } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 82c9e07a059bc481d877c7fbb2fbf866bf607017..7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9 100644 +index e2f315db8d137d7bc1b6fc83ed29032152f881f2..4951afd12de6145f671bae40a4df6e2222bc3fd8 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -988,4 +988,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1002,4 +1002,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean isInPowderedSnow(); // Paper end diff --git a/patches/api/0369-Block-Ticking-API.patch b/patches/api/0368-Block-Ticking-API.patch similarity index 100% rename from patches/api/0369-Block-Ticking-API.patch rename to patches/api/0368-Block-Ticking-API.patch diff --git a/patches/api/0370-Add-NamespacedKey-biome-methods.patch b/patches/api/0369-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0370-Add-NamespacedKey-biome-methods.patch rename to patches/api/0369-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0371-Also-load-resources-from-LibraryLoader.patch b/patches/api/0370-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0371-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0370-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0375-Add-getDrops-to-BlockState.patch b/patches/api/0374-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0375-Add-getDrops-to-BlockState.patch rename to patches/api/0374-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0377-Elder-Guardian-appearance-API.patch b/patches/api/0376-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0377-Elder-Guardian-appearance-API.patch rename to patches/api/0376-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0378-Allow-changing-bed-s-occupied-property.patch b/patches/api/0377-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0378-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0377-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0379-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0378-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0381-Add-entity-knockback-API.patch b/patches/api/0380-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0381-Add-entity-knockback-API.patch rename to patches/api/0380-Add-entity-knockback-API.patch diff --git a/patches/api/0382-Added-EntityToggleSitEvent.patch b/patches/api/0381-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0382-Added-EntityToggleSitEvent.patch rename to patches/api/0381-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0383-Add-Moving-Piston-API.patch b/patches/api/0382-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0383-Add-Moving-Piston-API.patch rename to patches/api/0382-Add-Moving-Piston-API.patch diff --git a/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0384-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0383-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0385-Add-Player-Warden-Warning-API.patch b/patches/api/0384-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0385-Add-Player-Warden-Warning-API.patch rename to patches/api/0384-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0387-Add-paper-dumplisteners-command.patch b/patches/api/0386-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0387-Add-paper-dumplisteners-command.patch rename to patches/api/0386-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0388-ItemStack-damage-API.patch b/patches/api/0387-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0388-ItemStack-damage-API.patch rename to patches/api/0387-ItemStack-damage-API.patch diff --git a/patches/api/0389-Add-Tick-TemporalUnit.patch b/patches/api/0388-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0389-Add-Tick-TemporalUnit.patch rename to patches/api/0388-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0390-Friction-API.patch b/patches/api/0389-Friction-API.patch similarity index 96% rename from patches/api/0390-Friction-API.patch rename to patches/api/0389-Friction-API.patch index 013ab9a8d323..23fa01d06349 100644 --- a/patches/api/0390-Friction-API.patch +++ b/patches/api/0389-Friction-API.patch @@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5 /** * Gets the item stack associated with this item drop. diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index cb5ba5d115406d12a2af0811fcfbf510f836b03b..b9f98279789fe26181aa9c7aa253877d916034be 100644 +index 041ff387a0f9e8037e2834118ef241ddb8970907..3a26b3c40f877a454c3c76b68b86776f05950002 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0391-Player-Entity-Tracking-Events.patch b/patches/api/0390-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0391-Player-Entity-Tracking-Events.patch rename to patches/api/0390-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0392-Add-missing-Fluid-type.patch b/patches/api/0391-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0392-Add-missing-Fluid-type.patch rename to patches/api/0391-Add-missing-Fluid-type.patch diff --git a/patches/api/0393-fix-Instruments.patch b/patches/api/0392-fix-Instruments.patch similarity index 100% rename from patches/api/0393-fix-Instruments.patch rename to patches/api/0392-fix-Instruments.patch diff --git a/patches/api/0394-Add-BlockLockCheckEvent.patch b/patches/api/0393-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0394-Add-BlockLockCheckEvent.patch rename to patches/api/0393-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0395-Add-Sneaking-API-for-Entities.patch b/patches/api/0394-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/api/0395-Add-Sneaking-API-for-Entities.patch rename to patches/api/0394-Add-Sneaking-API-for-Entities.patch index 70178866ab90..be37d7f75da1 100644 --- a/patches/api/0395-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0394-Add-Sneaking-API-for-Entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9..e0e93cb945202890387c1dc3c32927525e40296c 100644 +index 4951afd12de6145f671bae40a4df6e2222bc3fd8..909926485a66e09988f7787b1d5ee2cf9c012558 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -799,6 +799,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -813,6 +813,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @NotNull Pose getPose(); diff --git a/patches/api/0396-Improve-PortalEvents.patch b/patches/api/0395-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0396-Improve-PortalEvents.patch rename to patches/api/0395-Improve-PortalEvents.patch diff --git a/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/api/0398-Flying-Fall-Damage-API.patch b/patches/api/0397-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0398-Flying-Fall-Damage-API.patch rename to patches/api/0397-Flying-Fall-Damage-API.patch diff --git a/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0400-Win-Screen-API.patch b/patches/api/0399-Win-Screen-API.patch similarity index 96% rename from patches/api/0400-Win-Screen-API.patch rename to patches/api/0399-Win-Screen-API.patch index 3863beaa63ee..37414370417c 100644 --- a/patches/api/0400-Win-Screen-API.patch +++ b/patches/api/0399-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9d81aec1346d07faa47745a3cb79bac4a8a4ffa3..b49294027712e8d0b8aaaee1c041bc731b4cb184 100644 +index 6fc27c35f8533b37d82f0db5605d4d06e70af18b..0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1205,6 +1205,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0401-Add-Entity-Body-Yaw-API.patch b/patches/api/0400-Add-Entity-Body-Yaw-API.patch similarity index 93% rename from patches/api/0401-Add-Entity-Body-Yaw-API.patch rename to patches/api/0400-Add-Entity-Body-Yaw-API.patch index 8d0776b93e26..55b49feb0cd8 100644 --- a/patches/api/0401-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0400-Add-Entity-Body-Yaw-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e0e93cb945202890387c1dc3c32927525e40296c..18a2f82ecf9ca3ecb80053666d0de192e5185531 100644 +index 909926485a66e09988f7787b1d5ee2cf9c012558..17d5a5458ee51d8db243326745875ef31ba95fb3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1006,6 +1006,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1020,6 +1020,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return true if in powdered snow. */ boolean isInPowderedSnow(); diff --git a/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0403-Add-EntityFertilizeEggEvent.patch b/patches/api/0402-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0403-Add-EntityFertilizeEggEvent.patch rename to patches/api/0402-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0405-Add-Shearable-API.patch b/patches/api/0404-Add-Shearable-API.patch similarity index 97% rename from patches/api/0405-Add-Shearable-API.patch rename to patches/api/0404-Add-Shearable-API.patch index 4e49b175724a..19ef9a4a36e8 100644 --- a/patches/api/0405-Add-Shearable-API.patch +++ b/patches/api/0404-Add-Shearable-API.patch @@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad330335173612 + boolean readyToBeSheared(); +} diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java -index 794b7b4a870a0d289476074e3a3f46552604c954..2f9aefd38c43755c79b30abddd6643b26880bd0d 100644 +index cef1700834643fe28ed5737578d91ecefbe99e2f..86c0043ef4e1288b6fe2f68a9b6d01c3de2c3454 100644 --- a/src/main/java/org/bukkit/entity/MushroomCow.java +++ b/src/main/java/org/bukkit/entity/MushroomCow.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0407-Add-Mob-Experience-reward-API.patch b/patches/api/0406-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0407-Add-Mob-Experience-reward-API.patch rename to patches/api/0406-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0408-Expand-PlayerItemMendEvent.patch b/patches/api/0407-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0408-Expand-PlayerItemMendEvent.patch rename to patches/api/0407-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0409-Add-transient-modifier-API.patch b/patches/api/0408-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0409-Add-transient-modifier-API.patch rename to patches/api/0408-Add-transient-modifier-API.patch diff --git a/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch index f9f5110086cc..33a8a647a914 100644 --- a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 2dbb61df25967739c5a8308d6d89be20136816ba..12926d36a409448ce5aaae955968dbc89825a2c5 100644 +index b7b87b2962eabcf2e8864335e4da22c0b9da8e5c..65dab533a33433bdd79601df4f109d9de6998fb8 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -625,6 +625,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/api/0412-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0411-Folia-scheduler-and-owned-region-API.patch index 71062196c9eb..b94a13966764 100644 --- a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch @@ -769,10 +769,10 @@ index d433a9d2fe0bb487865fec33307cc4c45af475a0..f819de247080d58803a2851a4cab28d2 + // Paper end - Folia region threading API } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 18a2f82ecf9ca3ecb80053666d0de192e5185531..a5602bf27965a8aac97aa5279a23e785729a4921 100644 +index 17d5a5458ee51d8db243326745875ef31ba95fb3..05076e0648407d026b3adba43756e57f7e925abe 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1066,4 +1066,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1080,4 +1080,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox); // Paper end - Collision API diff --git a/patches/api/0413-Add-event-for-player-editing-sign.patch b/patches/api/0412-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0413-Add-event-for-player-editing-sign.patch rename to patches/api/0412-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0414-Add-Sign-getInteractableSideFor.patch b/patches/api/0413-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0414-Add-Sign-getInteractableSideFor.patch rename to patches/api/0413-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0415-Fix-BanList-API.patch b/patches/api/0414-Fix-BanList-API.patch similarity index 100% rename from patches/api/0415-Fix-BanList-API.patch rename to patches/api/0414-Fix-BanList-API.patch diff --git a/patches/api/0416-Add-whitelist-events.patch b/patches/api/0415-Add-whitelist-events.patch similarity index 100% rename from patches/api/0416-Add-whitelist-events.patch rename to patches/api/0415-Add-whitelist-events.patch diff --git a/patches/api/0417-API-for-updating-recipes-on-clients.patch b/patches/api/0416-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0417-API-for-updating-recipes-on-clients.patch rename to patches/api/0416-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0418-Add-PlayerFailMoveEvent.patch b/patches/api/0417-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0418-Add-PlayerFailMoveEvent.patch rename to patches/api/0417-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0419-Fix-custom-statistic-criteria-creation.patch b/patches/api/0418-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0419-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0418-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0420-SculkCatalyst-bloom-API.patch b/patches/api/0419-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0420-SculkCatalyst-bloom-API.patch rename to patches/api/0419-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch similarity index 88% rename from patches/api/0421-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0420-API-for-an-entity-s-scoreboard-name.patch index 85895ba202f8..67e76951f084 100644 --- a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a5602bf27965a8aac97aa5279a23e785729a4921..cbea8b9088fff5f08a47f6b26d7554d00710eb9f 100644 +index 05076e0648407d026b3adba43756e57f7e925abe..a7045fdf70e7dac94034ed6727a4eb29f31a9cdf 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -1077,4 +1077,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -1091,4 +1091,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler(); // Paper end - Folia schedulers diff --git a/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0423-Add-Listing-API-for-Player.patch b/patches/api/0422-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0423-Add-Listing-API-for-Player.patch rename to patches/api/0422-Add-Listing-API-for-Player.patch diff --git a/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0425-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0424-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0426-Expand-Pose-API.patch b/patches/api/0425-Expand-Pose-API.patch similarity index 92% rename from patches/api/0426-Expand-Pose-API.patch rename to patches/api/0425-Expand-Pose-API.patch index b016f55d9beb..0c88faca2694 100644 --- a/patches/api/0426-Expand-Pose-API.patch +++ b/patches/api/0425-Expand-Pose-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index cbea8b9088fff5f08a47f6b26d7554d00710eb9f..252ae4b7a002b34533988e0a574a24af8573a125 100644 +index a7045fdf70e7dac94034ed6727a4eb29f31a9cdf..66f9e50d96710a41ac009271a499318fcf119c54 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -816,6 +816,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -830,6 +830,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @param sneak true if the entity should be sneaking */ void setSneaking(boolean sneak); diff --git a/patches/api/0427-MerchantRecipe-add-copy-constructor.patch b/patches/api/0426-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0427-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0426-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0428-More-DragonBattle-API.patch b/patches/api/0427-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0428-More-DragonBattle-API.patch rename to patches/api/0427-More-DragonBattle-API.patch diff --git a/patches/api/0429-Add-PlayerPickItemEvent.patch b/patches/api/0428-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0429-Add-PlayerPickItemEvent.patch rename to patches/api/0428-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0430-Allow-trident-custom-damage.patch b/patches/api/0429-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0430-Allow-trident-custom-damage.patch rename to patches/api/0429-Allow-trident-custom-damage.patch diff --git a/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0433-Add-OfflinePlayer-isConnected.patch b/patches/api/0432-Add-OfflinePlayer-isConnected.patch similarity index 95% rename from patches/api/0433-Add-OfflinePlayer-isConnected.patch rename to patches/api/0432-Add-OfflinePlayer-isConnected.patch index f1e75ce3e478..fad59b6a54bc 100644 --- a/patches/api/0433-Add-OfflinePlayer-isConnected.patch +++ b/patches/api/0432-Add-OfflinePlayer-isConnected.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add OfflinePlayer#isConnected This adds an alternative to OfflinePlayer#isOnline that returns true only if the same instance of the player is still online. This is generally more useful than isOnline as it allows you to determine if you have an instance of a Player that still exists. If a player relogs an old Player instance becomes unlinked leading to e.g. messages sent to the old player no longer arriving despite isOnline returning true. Checking against isConnected is more useful there to discard invalid instances. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index ef6cb124adc98cb5231dc44e243450a2340f74af..abb5109ed08a3a651c2c27d4d17a3d49eb06da1e 100644 +index 6a84c3d0d15251694bb7a05393b9ff7a4d8e0617..30298a629b39bd43ce14b414fc697b2dfcbea89c 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -24,10 +24,26 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0437-Add-player-idle-duration-API.patch b/patches/api/0436-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0437-Add-player-idle-duration-API.patch rename to patches/api/0436-Add-player-idle-duration-API.patch diff --git a/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0441-Add-UUID-attribute-modifier-API.patch b/patches/api/0440-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0441-Add-UUID-attribute-modifier-API.patch rename to patches/api/0440-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0442-Expand-LingeringPotion-API.patch b/patches/api/0441-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0442-Expand-LingeringPotion-API.patch rename to patches/api/0441-Expand-LingeringPotion-API.patch diff --git a/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0444-Add-Structure-check-API.patch b/patches/api/0443-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0444-Add-Structure-check-API.patch rename to patches/api/0443-Add-Structure-check-API.patch diff --git a/patches/api/0445-add-missing-Experimental-annotations.patch b/patches/api/0444-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0445-add-missing-Experimental-annotations.patch rename to patches/api/0444-add-missing-Experimental-annotations.patch diff --git a/patches/api/0446-Add-more-scoreboard-API.patch b/patches/api/0445-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0446-Add-more-scoreboard-API.patch rename to patches/api/0445-Add-more-scoreboard-API.patch diff --git a/patches/api/0447-Improve-Registry.patch b/patches/api/0446-Improve-Registry.patch similarity index 100% rename from patches/api/0447-Improve-Registry.patch rename to patches/api/0446-Improve-Registry.patch diff --git a/patches/api/0448-Add-experience-points-API.patch b/patches/api/0447-Add-experience-points-API.patch similarity index 100% rename from patches/api/0448-Add-experience-points-API.patch rename to patches/api/0447-Add-experience-points-API.patch diff --git a/patches/api/0449-Add-missing-InventoryType.patch b/patches/api/0448-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0449-Add-missing-InventoryType.patch rename to patches/api/0448-Add-missing-InventoryType.patch diff --git a/patches/api/0450-Add-drops-to-shear-events.patch b/patches/api/0449-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0450-Add-drops-to-shear-events.patch rename to patches/api/0449-Add-drops-to-shear-events.patch diff --git a/patches/api/0451-Add-HiddenPotionEffect-API.patch b/patches/api/0450-Add-HiddenPotionEffect-API.patch similarity index 98% rename from patches/api/0451-Add-HiddenPotionEffect-API.patch rename to patches/api/0450-Add-HiddenPotionEffect-API.patch index 39585cefbac5..2c44d32af5f3 100644 --- a/patches/api/0451-Add-HiddenPotionEffect-API.patch +++ b/patches/api/0450-Add-HiddenPotionEffect-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 12926d36a409448ce5aaae955968dbc89825a2c5..e67455efc84f1e06d3396291d104ce65fee4591b 100644 +index 65dab533a33433bdd79601df4f109d9de6998fb8..5cb82901a5d0c8ee673501fc53389d526d4a5b6f 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -559,6 +559,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0452-Add-PlayerShieldDisableEvent.patch b/patches/api/0451-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0452-Add-PlayerShieldDisableEvent.patch rename to patches/api/0451-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0454-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0453-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0455-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0454-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0456-Add-ShulkerDuplicateEvent.patch b/patches/api/0455-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0456-Add-ShulkerDuplicateEvent.patch rename to patches/api/0455-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0458-Add-Lifecycle-Event-system.patch b/patches/api/0457-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0458-Add-Lifecycle-Event-system.patch rename to patches/api/0457-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0459-Conduit-API.patch b/patches/api/0458-Conduit-API.patch similarity index 100% rename from patches/api/0459-Conduit-API.patch rename to patches/api/0458-Conduit-API.patch diff --git a/patches/api/0460-ItemStack-Tooltip-API.patch b/patches/api/0459-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0460-ItemStack-Tooltip-API.patch rename to patches/api/0459-ItemStack-Tooltip-API.patch diff --git a/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0462-Add-FluidState-API.patch b/patches/api/0461-Add-FluidState-API.patch similarity index 100% rename from patches/api/0462-Add-FluidState-API.patch rename to patches/api/0461-Add-FluidState-API.patch diff --git a/patches/api/0463-add-number-format-api.patch b/patches/api/0462-add-number-format-api.patch similarity index 100% rename from patches/api/0463-add-number-format-api.patch rename to patches/api/0462-add-number-format-api.patch diff --git a/patches/api/0464-improve-BanList-types.patch b/patches/api/0463-improve-BanList-types.patch similarity index 100% rename from patches/api/0464-improve-BanList-types.patch rename to patches/api/0463-improve-BanList-types.patch diff --git a/patches/api/0465-Suspicious-Effect-Entry-API.patch b/patches/api/0464-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0465-Suspicious-Effect-Entry-API.patch rename to patches/api/0464-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0466-Fix-DamageSource-API.patch b/patches/api/0465-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0466-Fix-DamageSource-API.patch rename to patches/api/0465-Fix-DamageSource-API.patch diff --git a/patches/api/0467-Expanded-Hopper-API.patch b/patches/api/0466-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0467-Expanded-Hopper-API.patch rename to patches/api/0466-Expanded-Hopper-API.patch diff --git a/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/server/0386-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0385-Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0386-Add-PlayerRecipeBookClickEvent.patch rename to patches/server/0385-Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0385-Improve-Arrow-API.patch b/patches/server/0385-Improve-Arrow-API.patch deleted file mode 100644 index cbf5d4d81505..000000000000 --- a/patches/server/0385-Improve-Arrow-API.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nesaak <52047222+Nesaak@users.noreply.github.com> -Date: Sat, 23 May 2020 10:31:11 -0400 -Subject: [PATCH] Improve Arrow API - -Add method to get the arrow's itemstack and a method -to set the arrow's "noclip" status - -Co-authored-by: Jake Potrebic - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..762c395e45a681a11f3fe9d10e7f0ba310786e80 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -@@ -99,6 +99,23 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { - this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal()); - } - -+ // Paper start -+ @Override -+ public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() { -+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); -+ } -+ -+ @Override -+ public void setNoPhysics(boolean noPhysics) { -+ this.getHandle().setNoPhysics(noPhysics); -+ } -+ -+ @Override -+ public boolean hasNoPhysics() { -+ return this.getHandle().isNoPhysics(); -+ } -+ // Paper end -+ - @Override - public void setTicksLived(int value) { - super.setTicksLived(value); diff --git a/patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0387-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0386-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0388-Add-permission-for-command-blocks.patch b/patches/server/0387-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0388-Add-permission-for-command-blocks.patch rename to patches/server/0387-Add-permission-for-command-blocks.patch diff --git a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch similarity index 97% rename from patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch rename to patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch index fb16bb47aca2..ca8fc43bc64d 100644 --- a/patches/server/0389-Ensure-Entity-position-and-AABB-are-never-invalid.patch +++ b/patches/server/0388-Ensure-Entity-position-and-AABB-are-never-invalid.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9c9689f4deffed50df9aaca6e451228d17154b8c..11a9142962637af5e26939a5eb8f35ba5f205793 100644 +index 23ee63119d55b40829c03a855ae0f8b214674e10..0c6680bf15b57cf314638ab70d849e033719c0e1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -652,8 +652,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0390-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0389-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0391-Paper-dumpitem-command.patch b/patches/server/0390-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0391-Paper-dumpitem-command.patch rename to patches/server/0390-Paper-dumpitem-command.patch diff --git a/patches/server/0392-Improve-Legacy-Component-serialization-size.patch b/patches/server/0391-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0392-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0391-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0393-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0392-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0394-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0393-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/0394-Add-BlockStateMeta-clearBlockState.patch rename to patches/server/0393-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/0395-Support-old-UUID-format-for-NBT.patch b/patches/server/0394-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0395-Support-old-UUID-format-for-NBT.patch rename to patches/server/0394-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0396-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0395-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0397-Do-not-accept-invalid-client-settings.patch b/patches/server/0396-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0397-Do-not-accept-invalid-client-settings.patch rename to patches/server/0396-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0398-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0397-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0399-Add-entity-liquid-API.patch b/patches/server/0398-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0399-Add-entity-liquid-API.patch rename to patches/server/0398-Add-entity-liquid-API.patch diff --git a/patches/server/0400-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0399-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0400-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0399-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0401-Add-PrepareResultEvent.patch b/patches/server/0400-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0401-Add-PrepareResultEvent.patch rename to patches/server/0400-Add-PrepareResultEvent.patch diff --git a/patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0402-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0401-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0403-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0402-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0404-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0403-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0405-Fix-SPIGOT-5989.patch b/patches/server/0404-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0405-Fix-SPIGOT-5989.patch rename to patches/server/0404-Fix-SPIGOT-5989.patch diff --git a/patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0406-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0405-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0407-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0406-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0408-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0407-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0409-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0408-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0410-Fix-some-rails-connecting-improperly.patch b/patches/server/0409-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0410-Fix-some-rails-connecting-improperly.patch rename to patches/server/0409-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0411-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0410-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0412-Brand-support.patch b/patches/server/0411-Brand-support.patch similarity index 100% rename from patches/server/0412-Brand-support.patch rename to patches/server/0411-Brand-support.patch diff --git a/patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0413-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0412-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0414-Don-t-require-FACING-data.patch b/patches/server/0413-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0414-Don-t-require-FACING-data.patch rename to patches/server/0413-Don-t-require-FACING-data.patch diff --git a/patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0415-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0414-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0416-Add-moon-phase-API.patch b/patches/server/0415-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0416-Add-moon-phase-API.patch rename to patches/server/0415-Add-moon-phase-API.patch diff --git a/patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0417-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0416-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0418-Prevent-headless-pistons-from-being-created.patch b/patches/server/0417-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0418-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0417-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0419-Add-BellRingEvent.patch b/patches/server/0418-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0419-Add-BellRingEvent.patch rename to patches/server/0418-Add-BellRingEvent.patch diff --git a/patches/server/0420-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0419-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0420-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0419-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0421-Buffer-joins-to-world.patch b/patches/server/0420-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0421-Buffer-joins-to-world.patch rename to patches/server/0420-Buffer-joins-to-world.patch diff --git a/patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0422-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0421-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0423-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0422-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0424-Add-more-Evoker-API.patch b/patches/server/0423-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0424-Add-more-Evoker-API.patch rename to patches/server/0423-Add-more-Evoker-API.patch diff --git a/patches/server/0425-Add-methods-to-get-translation-keys.patch b/patches/server/0424-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0425-Add-methods-to-get-translation-keys.patch rename to patches/server/0424-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0426-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0425-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0427-Cache-block-data-strings.patch b/patches/server/0426-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0427-Cache-block-data-strings.patch rename to patches/server/0426-Cache-block-data-strings.patch diff --git a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 5fb2dcfe1feb..8d60c2216afc 100644 --- a/patches/server/0428-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0427-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -31,7 +31,7 @@ index 789576f8b7b3001c243972b320b7dffbbf3baa5f..3b73565d295c09a5ab0d610338498f01 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 11a9142962637af5e26939a5eb8f35ba5f205793..f839ab6dea7f1efd59f22bcef91d4e279b1c232a 100644 +index 0c6680bf15b57cf314638ab70d849e033719c0e1..f45b148884b305628411d57f7662ea454fde3906 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -162,6 +162,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0429-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0428-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0430-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0429-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0431-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0430-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 94% rename from patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 0710aed1e542..b01c30270296 100644 --- a/patches/server/0432-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0431-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f839ab6dea7f1efd59f22bcef91d4e279b1c232a..0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548 100644 +index f45b148884b305628411d57f7662ea454fde3906..44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4411,4 +4411,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0433-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0432-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0434-Entity-isTicking.patch b/patches/server/0433-Entity-isTicking.patch similarity index 94% rename from patches/server/0434-Entity-isTicking.patch rename to patches/server/0433-Entity-isTicking.patch index 2d53b98026e8..205f3da8d504 100644 --- a/patches/server/0434-Entity-isTicking.patch +++ b/patches/server/0433-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0281f4c4f7bc609ff7f35dcc8a7c13f6813d6548..f33067ea049793d898def3c83bff5b36490f8232 100644 +index 44610d4e3fb69e6cf5629d9e895e93d8dd5e09e9..2c0c41ae455ae5894e6bd85830741143c3d8aaa5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4416,5 +4416,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0435-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0434-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0436-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0435-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0437-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0436-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0438-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0437-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0439-Optimise-getType-calls.patch b/patches/server/0438-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0439-Optimise-getType-calls.patch rename to patches/server/0438-Optimise-getType-calls.patch diff --git a/patches/server/0440-Villager-resetOffers.patch b/patches/server/0439-Villager-resetOffers.patch similarity index 100% rename from patches/server/0440-Villager-resetOffers.patch rename to patches/server/0439-Villager-resetOffers.patch diff --git a/patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0441-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0440-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0442-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0441-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0443-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0442-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0443-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0442-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0444-Fix-bell-block-entity-memory-leak.patch b/patches/server/0443-Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/server/0444-Fix-bell-block-entity-memory-leak.patch rename to patches/server/0443-Fix-bell-block-entity-memory-leak.patch diff --git a/patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0445-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0444-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0446-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0445-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0446-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0445-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0447-Add-ignore-discounts-API.patch b/patches/server/0446-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0447-Add-ignore-discounts-API.patch rename to patches/server/0446-Add-ignore-discounts-API.patch diff --git a/patches/server/0448-Toggle-for-removing-existing-dragon.patch b/patches/server/0447-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0448-Toggle-for-removing-existing-dragon.patch rename to patches/server/0447-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0449-Fix-client-lag-on-advancement-loading.patch b/patches/server/0448-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0449-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0448-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0450-Item-no-age-no-player-pickup.patch b/patches/server/0449-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0450-Item-no-age-no-player-pickup.patch rename to patches/server/0449-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0451-Beacon-API-custom-effect-ranges.patch b/patches/server/0450-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0451-Beacon-API-custom-effect-ranges.patch rename to patches/server/0450-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0452-Add-API-for-quit-reason.patch b/patches/server/0451-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0452-Add-API-for-quit-reason.patch rename to patches/server/0451-Add-API-for-quit-reason.patch diff --git a/patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0453-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0452-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0454-Expose-world-spawn-angle.patch b/patches/server/0453-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0454-Expose-world-spawn-angle.patch rename to patches/server/0453-Expose-world-spawn-angle.patch diff --git a/patches/server/0455-Add-Destroy-Speed-API.patch b/patches/server/0454-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0455-Add-Destroy-Speed-API.patch rename to patches/server/0454-Add-Destroy-Speed-API.patch diff --git a/patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0456-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0455-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0457-Add-LivingEntity-clearActiveItem.patch b/patches/server/0456-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0457-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0456-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0458-Add-PlayerItemCooldownEvent.patch b/patches/server/0457-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0458-Add-PlayerItemCooldownEvent.patch rename to patches/server/0457-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0459-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0460-More-lightning-API.patch b/patches/server/0459-More-lightning-API.patch similarity index 100% rename from patches/server/0460-More-lightning-API.patch rename to patches/server/0459-More-lightning-API.patch diff --git a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch index e615ac322f77..6d2f4c21084d 100644 --- a/patches/server/0461-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0460-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f33067ea049793d898def3c83bff5b36490f8232..3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5 100644 +index 2c0c41ae455ae5894e6bd85830741143c3d8aaa5..82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1983,6 +1983,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0462-Add-missing-default-perms-for-commands.patch b/patches/server/0461-Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0462-Add-missing-default-perms-for-commands.patch rename to patches/server/0461-Add-missing-default-perms-for-commands.patch diff --git a/patches/server/0463-Add-PlayerShearBlockEvent.patch b/patches/server/0462-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0463-Add-PlayerShearBlockEvent.patch rename to patches/server/0462-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0464-Limit-recipe-packets.patch b/patches/server/0463-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0464-Limit-recipe-packets.patch rename to patches/server/0463-Limit-recipe-packets.patch diff --git a/patches/server/0465-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0464-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0465-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0464-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0466-Player-Chunk-Load-Unload-Events.patch b/patches/server/0465-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0466-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0465-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0467-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0466-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0468-Expose-LivingEntity-hurt-direction.patch b/patches/server/0467-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0468-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0467-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0469-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0468-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/server/0470-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/server/0469-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/server/0471-Add-TargetHitEvent.patch b/patches/server/0470-Add-TargetHitEvent.patch similarity index 100% rename from patches/server/0471-Add-TargetHitEvent.patch rename to patches/server/0470-Add-TargetHitEvent.patch diff --git a/patches/server/0472-MC-4-Fix-item-position-desync.patch b/patches/server/0471-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0472-MC-4-Fix-item-position-desync.patch rename to patches/server/0471-MC-4-Fix-item-position-desync.patch index f1fa7d66d3e1..5b680e0dd06b 100644 --- a/patches/server/0472-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0471-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..3c4ac79c094dc2fff7de94150a34b7bf public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3b9c691973f11b7d4db8fb77d2b02aa0d07ed7b5..df389ebaaef8ef307adb6c604ce22a192a522ba4 100644 +index 82ccfd91dfd3cce35a35edf8f73ccdd1ddd1fd6a..18cf11ddcf51e8b6251fd6df97f85e0ed15900c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4186,6 +4186,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0473-Additional-Block-Material-API.patch b/patches/server/0472-Additional-Block-Material-API.patch similarity index 100% rename from patches/server/0473-Additional-Block-Material-API.patch rename to patches/server/0472-Additional-Block-Material-API.patch diff --git a/patches/server/0474-Fix-harming-potion-dupe.patch b/patches/server/0473-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0474-Fix-harming-potion-dupe.patch rename to patches/server/0473-Fix-harming-potion-dupe.patch diff --git a/patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/server/0475-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/server/0474-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/server/0476-Cache-burn-durations.patch b/patches/server/0475-Cache-burn-durations.patch similarity index 100% rename from patches/server/0476-Cache-burn-durations.patch rename to patches/server/0475-Cache-burn-durations.patch diff --git a/patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0477-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0476-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0478-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0477-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0479-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0478-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0480-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0479-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0481-Zombie-API-breaking-doors.patch b/patches/server/0480-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0481-Zombie-API-breaking-doors.patch rename to patches/server/0480-Zombie-API-breaking-doors.patch diff --git a/patches/server/0482-Fix-nerfed-slime-when-splitting.patch b/patches/server/0481-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0482-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0481-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0483-Add-EntityLoadCrossbowEvent.patch b/patches/server/0482-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0483-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0482-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0484-Add-WorldGameRuleChangeEvent.patch b/patches/server/0483-Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0484-Add-WorldGameRuleChangeEvent.patch rename to patches/server/0483-Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0485-Add-ServerResourcesReloadedEvent.patch b/patches/server/0484-Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0485-Add-ServerResourcesReloadedEvent.patch rename to patches/server/0484-Add-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0486-Add-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0485-Add-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0487-Add-BlockFailedDispenseEvent.patch b/patches/server/0486-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0487-Add-BlockFailedDispenseEvent.patch rename to patches/server/0486-Add-BlockFailedDispenseEvent.patch diff --git a/patches/server/0488-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0487-Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0488-Add-PlayerLecternPageChangeEvent.patch rename to patches/server/0487-Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0489-Add-PlayerLoomPatternSelectEvent.patch rename to patches/server/0488-Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0490-Configurable-door-breaking-difficulty.patch b/patches/server/0489-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0490-Configurable-door-breaking-difficulty.patch rename to patches/server/0489-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0491-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0490-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0491-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0490-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0492-Remove-stale-POIs.patch b/patches/server/0491-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0492-Remove-stale-POIs.patch rename to patches/server/0491-Remove-stale-POIs.patch diff --git a/patches/server/0493-Fix-villager-boat-exploit.patch b/patches/server/0492-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0493-Fix-villager-boat-exploit.patch rename to patches/server/0492-Fix-villager-boat-exploit.patch diff --git a/patches/server/0494-Add-sendOpLevel-API.patch b/patches/server/0493-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0494-Add-sendOpLevel-API.patch rename to patches/server/0493-Add-sendOpLevel-API.patch diff --git a/patches/server/0495-TODO-Registry-Modification-API.patch b/patches/server/0494-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0495-TODO-Registry-Modification-API.patch rename to patches/server/0494-TODO-Registry-Modification-API.patch diff --git a/patches/server/0496-Add-StructuresLocateEvent.patch b/patches/server/0495-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0496-Add-StructuresLocateEvent.patch rename to patches/server/0495-Add-StructuresLocateEvent.patch diff --git a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch similarity index 97% rename from patches/server/0497-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0496-Collision-option-for-requiring-a-player-participant.patch index c029c3a9028f..176ae99bc8c9 100644 --- a/patches/server/0497-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0496-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index df389ebaaef8ef307adb6c604ce22a192a522ba4..fa5d634cefcf73afd3e090f91c4c589edb988352 100644 +index 18cf11ddcf51e8b6251fd6df97f85e0ed15900c4..2d8c476eb9f329ee6827340b6cec26a84901c56a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1848,6 +1848,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0498-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0497-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0499-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0498-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0500-Make-schedule-command-per-world.patch b/patches/server/0499-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0500-Make-schedule-command-per-world.patch rename to patches/server/0499-Make-schedule-command-per-world.patch diff --git a/patches/server/0501-Configurable-max-leash-distance.patch b/patches/server/0500-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0501-Configurable-max-leash-distance.patch rename to patches/server/0500-Configurable-max-leash-distance.patch diff --git a/patches/server/0502-Add-BlockPreDispenseEvent.patch b/patches/server/0501-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0502-Add-BlockPreDispenseEvent.patch rename to patches/server/0501-Add-BlockPreDispenseEvent.patch diff --git a/patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0503-Add-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0502-Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0504-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0503-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0505-Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0504-Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0506-Expand-EntityUnleashEvent.patch b/patches/server/0505-Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0506-Expand-EntityUnleashEvent.patch rename to patches/server/0505-Expand-EntityUnleashEvent.patch diff --git a/patches/server/0507-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0506-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0507-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0506-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0508-Add-DragonEggFormEvent.patch b/patches/server/0507-Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0508-Add-DragonEggFormEvent.patch rename to patches/server/0507-Add-DragonEggFormEvent.patch diff --git a/patches/server/0509-Add-EntityMoveEvent.patch b/patches/server/0508-Add-EntityMoveEvent.patch similarity index 100% rename from patches/server/0509-Add-EntityMoveEvent.patch rename to patches/server/0508-Add-EntityMoveEvent.patch diff --git a/patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0510-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0509-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0511-Inline-shift-direction-fields.patch b/patches/server/0510-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0511-Inline-shift-direction-fields.patch rename to patches/server/0510-Inline-shift-direction-fields.patch diff --git a/patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0512-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0511-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0513-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0512-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0514-living-entity-allow-attribute-registration.patch b/patches/server/0513-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0514-living-entity-allow-attribute-registration.patch rename to patches/server/0513-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0515-fix-dead-slime-setSize-invincibility.patch b/patches/server/0514-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0515-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0514-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0516-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0515-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0517-Expose-Tracked-Players.patch b/patches/server/0516-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0517-Expose-Tracked-Players.patch rename to patches/server/0516-Expose-Tracked-Players.patch diff --git a/patches/server/0518-Improve-ServerGUI.patch b/patches/server/0517-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0518-Improve-ServerGUI.patch rename to patches/server/0517-Improve-ServerGUI.patch diff --git a/patches/server/0519-fix-converting-txt-to-json-file.patch b/patches/server/0518-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0519-fix-converting-txt-to-json-file.patch rename to patches/server/0518-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0520-Add-worldborder-events.patch b/patches/server/0519-Add-worldborder-events.patch similarity index 100% rename from patches/server/0520-Add-worldborder-events.patch rename to patches/server/0519-Add-worldborder-events.patch diff --git a/patches/server/0521-Add-PlayerNameEntityEvent.patch b/patches/server/0520-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0521-Add-PlayerNameEntityEvent.patch rename to patches/server/0520-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0522-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0521-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0522-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0521-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0523-Add-recipe-to-cook-events.patch b/patches/server/0522-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0523-Add-recipe-to-cook-events.patch rename to patches/server/0522-Add-recipe-to-cook-events.patch diff --git a/patches/server/0524-Add-Block-isValidTool.patch b/patches/server/0523-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0524-Add-Block-isValidTool.patch rename to patches/server/0523-Add-Block-isValidTool.patch diff --git a/patches/server/0525-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0524-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0525-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0524-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0526-Expand-world-key-API.patch b/patches/server/0525-Expand-world-key-API.patch similarity index 100% rename from patches/server/0526-Expand-world-key-API.patch rename to patches/server/0525-Expand-world-key-API.patch diff --git a/patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0527-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0526-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0528-Item-Rarity-API.patch b/patches/server/0527-Item-Rarity-API.patch similarity index 100% rename from patches/server/0528-Item-Rarity-API.patch rename to patches/server/0527-Item-Rarity-API.patch diff --git a/patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0529-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0528-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0530-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0529-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0530-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0529-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0531-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0530-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0532-Expose-protocol-version.patch b/patches/server/0531-Expose-protocol-version.patch similarity index 100% rename from patches/server/0532-Expose-protocol-version.patch rename to patches/server/0531-Expose-protocol-version.patch diff --git a/patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0533-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0532-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0534-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0533-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0535-Add-bypass-host-check.patch b/patches/server/0534-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0535-Add-bypass-host-check.patch rename to patches/server/0534-Add-bypass-host-check.patch diff --git a/patches/server/0536-Set-area-affect-cloud-rotation.patch b/patches/server/0535-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0536-Set-area-affect-cloud-rotation.patch rename to patches/server/0535-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0537-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0536-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0538-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0537-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0539-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0538-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0540-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0539-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0541-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0540-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0542-Add-PlayerDeepSleepEvent.patch b/patches/server/0541-Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0542-Add-PlayerDeepSleepEvent.patch rename to patches/server/0541-Add-PlayerDeepSleepEvent.patch diff --git a/patches/server/0543-More-World-API.patch b/patches/server/0542-More-World-API.patch similarity index 100% rename from patches/server/0543-More-World-API.patch rename to patches/server/0542-More-World-API.patch diff --git a/patches/server/0544-Add-PlayerBedFailEnterEvent.patch b/patches/server/0543-Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0544-Add-PlayerBedFailEnterEvent.patch rename to patches/server/0543-Add-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0545-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0544-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 100% rename from patches/server/0546-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/server/0545-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch diff --git a/patches/server/0547-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0546-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0547-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0546-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0548-Add-Channel-initialization-listeners.patch b/patches/server/0547-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0548-Add-Channel-initialization-listeners.patch rename to patches/server/0547-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0549-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0548-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0550-Add-more-WanderingTrader-API.patch b/patches/server/0549-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0550-Add-more-WanderingTrader-API.patch rename to patches/server/0549-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0551-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0550-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0551-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0550-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0552-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0551-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0553-Add-HiddenPotionEffect-API.patch b/patches/server/0552-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/0553-Add-HiddenPotionEffect-API.patch rename to patches/server/0552-Add-HiddenPotionEffect-API.patch diff --git a/patches/server/0554-Inventory-close.patch b/patches/server/0553-Inventory-close.patch similarity index 100% rename from patches/server/0554-Inventory-close.patch rename to patches/server/0553-Inventory-close.patch diff --git a/patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0555-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0554-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0556-Add-basic-Datapack-API.patch b/patches/server/0555-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0556-Add-basic-Datapack-API.patch rename to patches/server/0555-Add-basic-Datapack-API.patch diff --git a/patches/server/0557-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0556-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0557-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0556-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0558-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0557-Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0558-Expand-PlayerGameModeChangeEvent.patch rename to patches/server/0557-Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0559-ItemStack-repair-check-API.patch b/patches/server/0558-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0559-ItemStack-repair-check-API.patch rename to patches/server/0558-ItemStack-repair-check-API.patch diff --git a/patches/server/0560-More-Enchantment-API.patch b/patches/server/0559-More-Enchantment-API.patch similarity index 100% rename from patches/server/0560-More-Enchantment-API.patch rename to patches/server/0559-More-Enchantment-API.patch diff --git a/patches/server/0561-Move-range-check-for-block-placing-up.patch b/patches/server/0560-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0561-Move-range-check-for-block-placing-up.patch rename to patches/server/0560-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0562-Add-Mob-lookAt-API.patch b/patches/server/0561-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0562-Add-Mob-lookAt-API.patch rename to patches/server/0561-Add-Mob-lookAt-API.patch diff --git a/patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/0563-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/0562-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/0564-Add-Unix-domain-socket-support.patch b/patches/server/0563-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0564-Add-Unix-domain-socket-support.patch rename to patches/server/0563-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0565-Add-EntityInsideBlockEvent.patch b/patches/server/0564-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0565-Add-EntityInsideBlockEvent.patch rename to patches/server/0564-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0566-Attributes-API-for-item-defaults.patch b/patches/server/0565-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0566-Attributes-API-for-item-defaults.patch rename to patches/server/0565-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0567-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0566-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0568-More-Lidded-Block-API.patch b/patches/server/0567-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0568-More-Lidded-Block-API.patch rename to patches/server/0567-More-Lidded-Block-API.patch diff --git a/patches/server/0569-Limit-item-frame-cursors-on-maps.patch b/patches/server/0568-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0569-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0568-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0570-Add-PlayerKickEvent-causes.patch b/patches/server/0569-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0570-Add-PlayerKickEvent-causes.patch rename to patches/server/0569-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0571-Add-PufferFishStateChangeEvent.patch b/patches/server/0570-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0571-Add-PufferFishStateChangeEvent.patch rename to patches/server/0570-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0572-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0571-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0573-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0572-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0574-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0573-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0575-Add-BellRevealRaiderEvent.patch b/patches/server/0574-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0575-Add-BellRevealRaiderEvent.patch rename to patches/server/0574-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0576-Fix-invulnerable-end-crystals.patch b/patches/server/0575-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0576-Fix-invulnerable-end-crystals.patch rename to patches/server/0575-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0577-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0576-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0577-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0576-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0578-Fix-dangerous-end-portal-logic.patch b/patches/server/0577-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0578-Fix-dangerous-end-portal-logic.patch rename to patches/server/0577-Fix-dangerous-end-portal-logic.patch index 3c92033da911..1b1c9918eca8 100644 --- a/patches/server/0578-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0577-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fa5d634cefcf73afd3e090f91c4c589edb988352..e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63 100644 +index 2d8c476eb9f329ee6827340b6cec26a84901c56a..e3647763bcede42f06250550985e149e39f2b0b8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -421,6 +421,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0579-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0578-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0580-Make-item-validations-configurable.patch b/patches/server/0579-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0580-Make-item-validations-configurable.patch rename to patches/server/0579-Make-item-validations-configurable.patch diff --git a/patches/server/0581-Line-Of-Sight-Changes.patch b/patches/server/0580-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0581-Line-Of-Sight-Changes.patch rename to patches/server/0580-Line-Of-Sight-Changes.patch diff --git a/patches/server/0582-add-per-world-spawn-limits.patch b/patches/server/0581-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0582-add-per-world-spawn-limits.patch rename to patches/server/0581-add-per-world-spawn-limits.patch diff --git a/patches/server/0583-Fix-potions-splash-events.patch b/patches/server/0582-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0583-Fix-potions-splash-events.patch rename to patches/server/0582-Fix-potions-splash-events.patch diff --git a/patches/server/0584-Add-more-LimitedRegion-API.patch b/patches/server/0583-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0584-Add-more-LimitedRegion-API.patch rename to patches/server/0583-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0585-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0584-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0586-Missing-Entity-API.patch b/patches/server/0585-Missing-Entity-API.patch similarity index 98% rename from patches/server/0586-Missing-Entity-API.patch rename to patches/server/0585-Missing-Entity-API.patch index b2f850af74f4..d12a12082aec 100644 --- a/patches/server/0586-Missing-Entity-API.patch +++ b/patches/server/0585-Missing-Entity-API.patch @@ -39,6 +39,7 @@ Co-authored-by: booky10 Co-authored-by: Amin Co-authored-by: TrollyLoki Co-authored-by: FireInstall +Co-authored-by: maxcom1 <46265094+maxcom1@users.noreply.github.com> diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java index 8117578ced94aa6bf01871f6526a388385c4adf2..59699c59fdfc611177fdb3136f84ab539b17d9c9 100644 @@ -670,26 +671,36 @@ index fc0f0e841dc974d080e1abb9bbafb5165801131f..d657fd2c507a5b215aeab0a5f3e9c2ee + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..dd1ca63d2d6e4c8606c28380f81b79b7ee211a35 100644 +index 07158732dd6a5b7d622b7f2ea10ca87b50365b8a..ebbefcdea6356384f27e964bd551bad2f9e696e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1078,4 +1078,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1078,4 +1078,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return set; } // Paper end + -+ // Paper start - move up invisibility ++ // Paper start - missing entity api + @Override -+ public boolean isInvisible() { ++ public boolean isInvisible() { // Paper - moved up from LivingEntity + return this.getHandle().isInvisible(); + } + + @Override -+ public void setInvisible(boolean invisible) { ++ public void setInvisible(boolean invisible) { // Paper - moved up from LivingEntity + this.getHandle().persistentInvisibility = invisible; + this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); + } -+ // Paper end - move up invisibility ++ ++ @Override ++ public void setNoPhysics(boolean noPhysics) { ++ this.getHandle().noPhysics = noPhysics; ++ } ++ ++ @Override ++ public boolean hasNoPhysics() { ++ return this.getHandle().noPhysics; ++ } ++ // Paper end - missing entity api } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..e1a2f0924da6ebcdf332040f922226af5d8a2d45 100644 diff --git a/patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0587-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0586-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0588-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0587-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0589-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0588-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0590-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0589-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0591-Add-PlayerArmSwingEvent.patch b/patches/server/0590-Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0591-Add-PlayerArmSwingEvent.patch rename to patches/server/0590-Add-PlayerArmSwingEvent.patch diff --git a/patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0592-Fix-kick-event-leave-message-not-being-sent.patch rename to patches/server/0591-Fix-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0593-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0592-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0594-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0593-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0594-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0593-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0595-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0594-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0596-Add-missing-forceDrop-toggles.patch b/patches/server/0595-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0596-Add-missing-forceDrop-toggles.patch rename to patches/server/0595-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0597-Stinger-API.patch b/patches/server/0596-Stinger-API.patch similarity index 95% rename from patches/server/0597-Stinger-API.patch rename to patches/server/0596-Stinger-API.patch index 262a4a848175..d5e15af3c093 100644 --- a/patches/server/0597-Stinger-API.patch +++ b/patches/server/0596-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 9a7a670c1e99674e8a554342165b7b77001083fc..e1092bb514e01e978a8d624bd5a7cba5b4b5fe81 100644 +index 6218f15194b7ae0b17f7f1dab78b1337779edb27..9fed7d8500481493de32efd16de6b271b9ed446d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -338,6 +338,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0598-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0599-Add-System.out-err-catcher.patch b/patches/server/0598-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0599-Add-System.out-err-catcher.patch rename to patches/server/0598-Add-System.out-err-catcher.patch diff --git a/patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0600-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0599-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0601-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0600-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0602-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0601-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0603-Add-PlayerSetSpawnEvent.patch b/patches/server/0602-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0603-Add-PlayerSetSpawnEvent.patch rename to patches/server/0602-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 94% rename from patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch index 77dfd1234024..0de1d33a58c9 100644 --- a/patches/server/0604-Make-hoppers-respect-inventory-max-stack-size.patch +++ b/patches/server/0603-Make-hoppers-respect-inventory-max-stack-size.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make hoppers respect inventory max stack size diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 8aabefdcbeb3fc5fb7d11fe04ee629fe7bc612c2..4dda44608320c2a872b23053a1c3de63b79741c2 100644 +index f0b4b8eb5d2740cd73b4338fd0c2acc3b06df1f6..e3b6f2bf93710ea695b0c25c0b6968a8f24f0829 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -438,15 +438,17 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0605-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0604-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0605-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0604-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0606-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0605-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0606-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0605-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0607-Add-EntityDamageItemEvent.patch b/patches/server/0606-Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0607-Add-EntityDamageItemEvent.patch rename to patches/server/0606-Add-EntityDamageItemEvent.patch diff --git a/patches/server/0608-Optimize-indirect-passenger-iteration.patch b/patches/server/0607-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0608-Optimize-indirect-passenger-iteration.patch rename to patches/server/0607-Optimize-indirect-passenger-iteration.patch index 92ffa35c2c7d..cdd80aa9b6e9 100644 --- a/patches/server/0608-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0607-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e9a12d9b7c8789f3d07ba5a799c941ca25eb3e63..96ed3d345085c7d86643166fb4c124675e6b07d4 100644 +index e3647763bcede42f06250550985e149e39f2b0b8..f93e74226e3306a59e17dce1e4f8e72d61d75d49 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3842,20 +3842,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0609-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0608-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0610-Clear-bucket-NBT-after-dispense.patch b/patches/server/0609-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0610-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0609-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0611-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0610-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0612-Add-BlockBreakBlockEvent.patch b/patches/server/0611-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0612-Add-BlockBreakBlockEvent.patch rename to patches/server/0611-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0613-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0612-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0614-More-CommandBlock-API.patch b/patches/server/0613-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0614-More-CommandBlock-API.patch rename to patches/server/0613-More-CommandBlock-API.patch diff --git a/patches/server/0615-Add-missing-team-sidebar-display-slots.patch b/patches/server/0614-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0615-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0614-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0616-Add-back-EntityPortalExitEvent.patch b/patches/server/0615-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0616-Add-back-EntityPortalExitEvent.patch rename to patches/server/0615-Add-back-EntityPortalExitEvent.patch index 5e091febda53..566d9576dab5 100644 --- a/patches/server/0616-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0615-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 96ed3d345085c7d86643166fb4c124675e6b07d4..822666e1199e0851136d88b2b556d8d17843d902 100644 +index f93e74226e3306a59e17dce1e4f8e72d61d75d49..7dbbf0884b70acb37c3400364736fa8f6b68c964 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3291,6 +3291,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0617-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0616-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0618-Get-entity-default-attributes.patch b/patches/server/0617-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0618-Get-entity-default-attributes.patch rename to patches/server/0617-Get-entity-default-attributes.patch diff --git a/patches/server/0619-Left-handed-API.patch b/patches/server/0618-Left-handed-API.patch similarity index 100% rename from patches/server/0619-Left-handed-API.patch rename to patches/server/0618-Left-handed-API.patch diff --git a/patches/server/0620-Add-more-advancement-API.patch b/patches/server/0619-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0620-Add-more-advancement-API.patch rename to patches/server/0619-Add-more-advancement-API.patch diff --git a/patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0621-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0620-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0622-Add-critical-damage-API.patch b/patches/server/0621-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0622-Add-critical-damage-API.patch rename to patches/server/0621-Add-critical-damage-API.patch diff --git a/patches/server/0623-Fix-issues-with-mob-conversion.patch b/patches/server/0622-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0623-Fix-issues-with-mob-conversion.patch rename to patches/server/0622-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0624-Add-isCollidable-methods-to-various-places.patch b/patches/server/0623-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0624-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0623-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0625-Goat-ram-API.patch b/patches/server/0624-Goat-ram-API.patch similarity index 100% rename from patches/server/0625-Goat-ram-API.patch rename to patches/server/0624-Goat-ram-API.patch diff --git a/patches/server/0626-Add-API-for-resetting-a-single-score.patch b/patches/server/0625-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0626-Add-API-for-resetting-a-single-score.patch rename to patches/server/0625-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch index b57a9d9bb217..ad5e5a00312f 100644 --- a/patches/server/0627-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0626-Add-Raw-Byte-Entity-Serialization.patch @@ -27,7 +27,7 @@ index 7dbbf0884b70acb37c3400364736fa8f6b68c964..5dce3d38ecd7b7639f02f3e1e92f3723 return this.isPassenger() ? false : this.saveAsPassenger(nbt); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb1073ed9f07 100644 +index ebbefcdea6356384f27e964bd551bad2f9e696e8..06febdb103f98dd16cca32d7345b0ca6b52dcade 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1077,6 +1077,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -46,7 +46,7 @@ index 08d63e104ddc079af6349b6b3665cadae1c619ad..6a31fb773798e911e731c35e2d52eb10 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index 609b103cb9af3b0554bf1116306874fe98c8534c..3f582c5653e13875cce4ef8ecd279d8a3d2b2dc2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/patches/server/0628-Vanilla-command-permission-fixes.patch b/patches/server/0627-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0628-Vanilla-command-permission-fixes.patch rename to patches/server/0627-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0629-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0628-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0630-Fix-GameProfileCache-concurrency.patch b/patches/server/0629-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0630-Fix-GameProfileCache-concurrency.patch rename to patches/server/0629-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch similarity index 99% rename from patches/server/0631-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0630-Improve-and-expand-AsyncCatcher.patch index 70908f281c2f..3da2f1c96b4b 100644 --- a/patches/server/0631-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0630-Improve-and-expand-AsyncCatcher.patch @@ -202,7 +202,7 @@ index ca68faef4232859e833adfd86a0ce13f7c2ad00e..df57157317fc6c84f69751fd8a120761 ClientboundSoundEntityPacket packet = new ClientboundSoundEntityPacket(Holder.direct(SoundEvent.createVariableRangeEvent(new ResourceLocation(sound))), net.minecraft.sounds.SoundSource.valueOf(category.name()), craftEntity.getHandle(), volume, pitch, seed); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index e1092bb514e01e978a8d624bd5a7cba5b4b5fe81..1170cf9b3b61fae099ed8574888187cf4f20ffd1 100644 +index 9fed7d8500481493de32efd16de6b271b9ed446d..a67570fedb8f09a118351b1b5c3d47bc568f5c0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -501,6 +501,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0632-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0631-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0633-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0632-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0633-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0632-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0634-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0633-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0634-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0633-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0635-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0634-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0636-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0635-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0637-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0636-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0638-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/server/0637-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0639-Time-scoreboard-search.patch b/patches/server/0638-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0639-Time-scoreboard-search.patch rename to patches/server/0638-Time-scoreboard-search.patch diff --git a/patches/server/0640-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0639-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0640-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0639-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0641-Add-missing-InventoryType.patch b/patches/server/0640-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0641-Add-missing-InventoryType.patch rename to patches/server/0640-Add-missing-InventoryType.patch diff --git a/patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0642-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0641-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0643-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0642-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0644-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0643-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0645-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0644-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0646-Add-packet-limiter-config.patch b/patches/server/0645-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0646-Add-packet-limiter-config.patch rename to patches/server/0645-Add-packet-limiter-config.patch diff --git a/patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0647-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0646-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0648-Ensure-valid-vehicle-status.patch b/patches/server/0647-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0648-Ensure-valid-vehicle-status.patch rename to patches/server/0647-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0649-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0648-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0650-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0649-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0651-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0650-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0651-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0650-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0652-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0651-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0652-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0651-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0653-Preserve-overstacked-loot.patch b/patches/server/0652-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0653-Preserve-overstacked-loot.patch rename to patches/server/0652-Preserve-overstacked-loot.patch diff --git a/patches/server/0654-Update-head-rotation-in-missing-places.patch b/patches/server/0653-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0654-Update-head-rotation-in-missing-places.patch rename to patches/server/0653-Update-head-rotation-in-missing-places.patch index d43abb0d8a09..5fdcb1a6cb92 100644 --- a/patches/server/0654-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0653-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e6ef67a7a2eab5314c95e751895b4d4ce71c91b8..efdc94c6e57dcd5c122300f77ca0cc058651aa7e 100644 +index 5dce3d38ecd7b7639f02f3e1e92f3723f4a42c39..ec23aa4f86fed6890273d06b8cfb4000daf3c515 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1790,6 +1790,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0655-prevent-unintended-light-block-manipulation.patch b/patches/server/0654-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0655-prevent-unintended-light-block-manipulation.patch rename to patches/server/0654-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0656-Fix-CraftCriteria-defaults-map.patch b/patches/server/0655-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0656-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0655-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0657-Fix-upstreams-block-state-factories.patch b/patches/server/0656-Fix-upstreams-block-state-factories.patch similarity index 99% rename from patches/server/0657-Fix-upstreams-block-state-factories.patch rename to patches/server/0656-Fix-upstreams-block-state-factories.patch index cd44e53b9919..b93094848520 100644 --- a/patches/server/0657-Fix-upstreams-block-state-factories.patch +++ b/patches/server/0656-Fix-upstreams-block-state-factories.patch @@ -26,7 +26,7 @@ index 53443b472d21633f49c102b330c8406c92f09d8d..4893eaf93738da860014ddf3ad003334 if (state instanceof InventoryHolder) return (InventoryHolder) state; return null; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index f1f6d85399db86ce7aee1fccde51d6259b427e7e..53d466bfa66573f178fd0e0247bcefc04902c38f 100644 +index ff3f88f107a4c059688566b69dcdf48bc01210ab..7cd0fae59c497861063827eda4243cc6c11e7cff 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -13,7 +13,7 @@ import org.bukkit.persistence.PersistentDataContainer; diff --git a/patches/server/0658-Configurable-feature-seeds.patch b/patches/server/0657-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0658-Configurable-feature-seeds.patch rename to patches/server/0657-Configurable-feature-seeds.patch diff --git a/patches/server/0659-Add-root-admin-user-detection.patch b/patches/server/0658-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0659-Add-root-admin-user-detection.patch rename to patches/server/0658-Add-root-admin-user-detection.patch diff --git a/patches/server/0660-Always-allow-item-changing-in-Fireball.patch b/patches/server/0659-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0660-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0659-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch index 5eff5788ebfd..96f8ca01bb41 100644 --- a/patches/server/0661-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0660-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index efdc94c6e57dcd5c122300f77ca0cc058651aa7e..5691ce8e654b05d466f179f87b17cc627de98fcb 100644 +index ec23aa4f86fed6890273d06b8cfb4000daf3c515..a89cd343bee7ea919c3ba5789e37b05e6a1cf334 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -718,7 +718,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0662-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0661-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0663-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0662-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0664-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0663-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0665-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0664-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0666-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0665-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0667-Fix-Spigot-growth-modifiers.patch b/patches/server/0666-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0667-Fix-Spigot-growth-modifiers.patch rename to patches/server/0666-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0668-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0667-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch similarity index 97% rename from patches/server/0669-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0668-Add-PlayerItemFrameChangeEvent.patch index e46cc3be4c2b..7dd61945d1eb 100644 --- a/patches/server/0669-Add-PlayerItemFrameChangeEvent.patch +++ b/patches/server/0668-Add-PlayerItemFrameChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerItemFrameChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 8289ea080aa297f75cdbc8d591d6efa6a0def0ea..3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830 100644 +index 5c507b1160835fd4beb3b2d5b621250540545d4e..ab85050a64d4897aff11d0780d8cb26660918ac7 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -3,6 +3,7 @@ package net.minecraft.world.entity.decoration; diff --git a/patches/server/0670-Optimize-HashMapPalette.patch b/patches/server/0669-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0670-Optimize-HashMapPalette.patch rename to patches/server/0669-Optimize-HashMapPalette.patch diff --git a/patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0671-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0670-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0672-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0671-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0673-Add-more-Campfire-API.patch b/patches/server/0672-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0673-Add-more-Campfire-API.patch rename to patches/server/0672-Add-more-Campfire-API.patch diff --git a/patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0674-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0673-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0675-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0674-Forward-CraftEntity-in-teleport-command.patch index 493db169a462..18a8c45967bc 100644 --- a/patches/server/0675-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0674-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5691ce8e654b05d466f179f87b17cc627de98fcb..653b5bedf9b6132a5410be5f9c36a36cf99b6f68 100644 +index a89cd343bee7ea919c3ba5789e37b05e6a1cf334..6c8478c9ad154b25e11085ac47552b5855b5e9d1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3263,6 +3263,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0676-Improve-scoreboard-entries.patch b/patches/server/0675-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0676-Improve-scoreboard-entries.patch rename to patches/server/0675-Improve-scoreboard-entries.patch diff --git a/patches/server/0677-Entity-powdered-snow-API.patch b/patches/server/0676-Entity-powdered-snow-API.patch similarity index 92% rename from patches/server/0677-Entity-powdered-snow-API.patch rename to patches/server/0676-Entity-powdered-snow-API.patch index e06e388df9a7..60a2d3839bb5 100644 --- a/patches/server/0677-Entity-powdered-snow-API.patch +++ b/patches/server/0676-Entity-powdered-snow-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Entity powdered snow API public net.minecraft.world.entity.monster.Skeleton inPowderSnowTime diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e53820a9be97 100644 +index 06febdb103f98dd16cca32d7345b0ca6b52dcade..8f0df02a81c36244a3906efa6605f5eba030bfb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1087,6 +1087,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -21,7 +21,7 @@ index 6a31fb773798e911e731c35e2d52eb1073ed9f07..6a8251ae85f192925493b3e084c0e538 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java index a0ea54181de6c6685deef265cbe9f66aabbca42b..6f98da9be6aef35e3b5c940188b872459a383c8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java diff --git a/patches/server/0678-Add-API-for-item-entity-health.patch b/patches/server/0677-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0678-Add-API-for-item-entity-health.patch rename to patches/server/0677-Add-API-for-item-entity-health.patch diff --git a/patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0679-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0678-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0680-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0679-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0681-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0680-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0682-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0681-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0683-Fix-bees-aging-inside-hives.patch b/patches/server/0682-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0683-Fix-bees-aging-inside-hives.patch rename to patches/server/0682-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0684-Bucketable-API.patch b/patches/server/0683-Bucketable-API.patch similarity index 100% rename from patches/server/0684-Bucketable-API.patch rename to patches/server/0683-Bucketable-API.patch diff --git a/patches/server/0685-Validate-usernames.patch b/patches/server/0684-Validate-usernames.patch similarity index 100% rename from patches/server/0685-Validate-usernames.patch rename to patches/server/0684-Validate-usernames.patch diff --git a/patches/server/0686-Make-water-animal-spawn-height-configurable.patch b/patches/server/0685-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0686-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0685-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0687-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0686-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0688-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0687-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0689-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0688-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0690-Multiple-Entries-with-Scoreboards.patch b/patches/server/0689-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0690-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0689-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0691-Reset-placed-block-on-exception.patch b/patches/server/0690-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0691-Reset-placed-block-on-exception.patch rename to patches/server/0690-Reset-placed-block-on-exception.patch diff --git a/patches/server/0692-Add-configurable-height-for-slime-spawn.patch b/patches/server/0691-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0692-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0691-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0693-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0692-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0693-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0692-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0694-Multi-Block-Change-API-Implementation.patch b/patches/server/0693-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0694-Multi-Block-Change-API-Implementation.patch rename to patches/server/0693-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0695-Fix-NotePlayEvent.patch b/patches/server/0694-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0695-Fix-NotePlayEvent.patch rename to patches/server/0694-Fix-NotePlayEvent.patch diff --git a/patches/server/0696-Freeze-Tick-Lock-API.patch b/patches/server/0695-Freeze-Tick-Lock-API.patch similarity index 95% rename from patches/server/0696-Freeze-Tick-Lock-API.patch rename to patches/server/0695-Freeze-Tick-Lock-API.patch index 7ca49418f13a..65e67e59654e 100644 --- a/patches/server/0696-Freeze-Tick-Lock-API.patch +++ b/patches/server/0695-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 653b5bedf9b6132a5410be5f9c36a36cf99b6f68..80d5a7a77fab3b978ee4a1a76b992eb666486792 100644 +index 6c8478c9ad154b25e11085ac47552b5855b5e9d1..7e6ea850078179f7c63b597a788ef105802a0260 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -59,7 +59,7 @@ index 9af308ef5e55df9ce08b25e358e48d1c6f67d663..511e8e789932df77999689659d1efbe3 if (this.isInPowderSnow && this.canFreeze()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 71f9b7bbbabae9291fdb9f902f3f69c13e715c0e..a5a9c34709d3bb716e2dc9bb6bd548992df74f46 100644 +index 8f0df02a81c36244a3906efa6605f5eba030bfb9..88e05b8ec5f442b3ad14e3b39a06beeca5c169ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -321,6 +321,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0697-More-PotionEffectType-API.patch b/patches/server/0696-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0697-More-PotionEffectType-API.patch rename to patches/server/0696-More-PotionEffectType-API.patch diff --git a/patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0698-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0697-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0699-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0698-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0700-Add-missing-structure-set-seed-configs.patch b/patches/server/0699-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0700-Add-missing-structure-set-seed-configs.patch rename to patches/server/0699-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0701-Implement-regenerateChunk.patch b/patches/server/0700-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0701-Implement-regenerateChunk.patch rename to patches/server/0700-Implement-regenerateChunk.patch diff --git a/patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0702-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0701-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0703-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0702-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0704-Add-GameEvent-tags.patch b/patches/server/0703-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0704-Add-GameEvent-tags.patch rename to patches/server/0703-Add-GameEvent-tags.patch diff --git a/patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0705-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0704-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0706-Furnace-RecipesUsed-API.patch b/patches/server/0705-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0706-Furnace-RecipesUsed-API.patch rename to patches/server/0705-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0707-Configurable-sculk-sensor-listener-range.patch b/patches/server/0706-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0707-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0706-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0708-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0708-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0707-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0709-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0710-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0709-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0711-Fix-Entity-Position-Desync.patch b/patches/server/0710-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0711-Fix-Entity-Position-Desync.patch rename to patches/server/0710-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0712-Custom-Potion-Mixes.patch b/patches/server/0711-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0712-Custom-Potion-Mixes.patch rename to patches/server/0711-Custom-Potion-Mixes.patch diff --git a/patches/server/0713-Force-close-world-loading-screen.patch b/patches/server/0712-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0713-Force-close-world-loading-screen.patch rename to patches/server/0712-Force-close-world-loading-screen.patch diff --git a/patches/server/0714-Fix-falling-block-spawn-methods.patch b/patches/server/0713-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0714-Fix-falling-block-spawn-methods.patch rename to patches/server/0713-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0715-Expose-furnace-minecart-push-values.patch b/patches/server/0714-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0715-Expose-furnace-minecart-push-values.patch rename to patches/server/0714-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0716-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0715-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0717-More-Projectile-API.patch b/patches/server/0716-More-Projectile-API.patch similarity index 97% rename from patches/server/0717-More-Projectile-API.patch rename to patches/server/0716-More-Projectile-API.patch index ef828fda142a..30d520d8be31 100644 --- a/patches/server/0717-More-Projectile-API.patch +++ b/patches/server/0716-More-Projectile-API.patch @@ -133,7 +133,7 @@ index 91c2d0b40d3fca86938cd454e1415a4eea3df7c7..c1c52f4fc5f900fac4098e5e37c52dfc + // Paper end - More projectile API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java -index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc042ea0e0c 100644 +index 35d8fbd9c5751568a1a3b8928017e23cd41bb163..3a749f78be3968e499e096196eaaa0b433a53c06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java @@ -58,20 +58,7 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { @@ -158,10 +158,17 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0 @Override public boolean isInBlock() { -@@ -105,6 +92,27 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { - return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); +@@ -99,6 +86,35 @@ public class CraftArrow extends AbstractProjectile implements AbstractArrow { + this.getHandle().pickup = net.minecraft.world.entity.projectile.AbstractArrow.Pickup.byOrdinal(status.ordinal()); } ++ // Paper start ++ @Override ++ @org.jetbrains.annotations.NotNull ++ public org.bukkit.craftbukkit.inventory.CraftItemStack getItemStack() { ++ return org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(getHandle().getPickupItem()); ++ } ++ + @Override + public void setLifetimeTicks(int ticks) { + this.getHandle().life = ticks; @@ -182,12 +189,13 @@ index 762c395e45a681a11f3fe9d10e7f0ba310786e80..6d2fe30742f8b41d53dd2cbff120fcc0 + public void setHitSound(@org.jetbrains.annotations.NotNull org.bukkit.Sound sound) { + this.getHandle().setSoundEvent(org.bukkit.craftbukkit.CraftSound.bukkitToMinecraft(sound)); + } ++ // Paper end + @Override - public void setNoPhysics(boolean noPhysics) { - this.getHandle().setNoPhysics(noPhysics); + public void setTicksLived(int value) { + super.setTicksLived(value); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java -index 73cb7aa01af3eed71b05b1a539f082b26dcd8d60..2783e218d5e5c24787429237974e196761f4d02b 100644 +index e1a2f0924da6ebcdf332040f922226af5d8a2d45..a8699b274b51c5f6691557c3c3db88436f05e304 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -32,20 +32,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball { diff --git a/patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0718-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0717-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0719-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0718-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0720-Implement-getComputedBiome-API.patch b/patches/server/0719-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0720-Implement-getComputedBiome-API.patch rename to patches/server/0719-Implement-getComputedBiome-API.patch diff --git a/patches/server/0721-Make-some-itemstacks-nonnull.patch b/patches/server/0720-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0721-Make-some-itemstacks-nonnull.patch rename to patches/server/0720-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0722-Implement-enchantWithLevels-API.patch b/patches/server/0721-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0722-Implement-enchantWithLevels-API.patch rename to patches/server/0721-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0723-Fix-saving-in-unloadWorld.patch b/patches/server/0722-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0723-Fix-saving-in-unloadWorld.patch rename to patches/server/0722-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0724-Buffer-OOB-setBlock-calls.patch b/patches/server/0723-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0724-Buffer-OOB-setBlock-calls.patch rename to patches/server/0723-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0725-Add-TameableDeathMessageEvent.patch b/patches/server/0724-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0725-Add-TameableDeathMessageEvent.patch rename to patches/server/0724-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0726-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0725-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0727-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0726-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 91% rename from patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch index 846f0c230c00..a841c24fcda0 100644 --- a/patches/server/0728-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0727-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 80d5a7a77fab3b978ee4a1a76b992eb666486792..3d0f7310840742a5b16f0c0a7115dc0c90202919 100644 +index 7e6ea850078179f7c63b597a788ef105802a0260..2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2580,7 +2580,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0729-cache-resource-keys.patch b/patches/server/0728-cache-resource-keys.patch similarity index 100% rename from patches/server/0729-cache-resource-keys.patch rename to patches/server/0728-cache-resource-keys.patch diff --git a/patches/server/0730-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0729-Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/server/0730-Allow-changing-the-EnderDragon-podium.patch rename to patches/server/0729-Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0731-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0730-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0732-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0731-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0733-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0732-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0734-Expand-PlayerItemDamageEvent.patch b/patches/server/0733-Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0734-Expand-PlayerItemDamageEvent.patch rename to patches/server/0733-Expand-PlayerItemDamageEvent.patch diff --git a/patches/server/0735-WorldCreator-keepSpawnLoaded.patch b/patches/server/0734-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0735-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0734-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0736-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0735-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0737-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0736-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0738-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0737-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0739-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0738-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0740-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0739-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0741-Add-PlayerStopUsingItemEvent.patch b/patches/server/0740-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0741-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0740-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0742-Don-t-tick-markers.patch b/patches/server/0741-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0742-Don-t-tick-markers.patch rename to patches/server/0741-Don-t-tick-markers.patch diff --git a/patches/server/0743-Expand-FallingBlock-API.patch b/patches/server/0742-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0743-Expand-FallingBlock-API.patch rename to patches/server/0742-Expand-FallingBlock-API.patch diff --git a/patches/server/0744-Add-support-for-Proxy-Protocol.patch b/patches/server/0743-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0744-Add-support-for-Proxy-Protocol.patch rename to patches/server/0743-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0745-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0744-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0746-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0745-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0747-properly-read-and-store-sus-effect-duration.patch b/patches/server/0746-properly-read-and-store-sus-effect-duration.patch similarity index 100% rename from patches/server/0747-properly-read-and-store-sus-effect-duration.patch rename to patches/server/0746-properly-read-and-store-sus-effect-duration.patch diff --git a/patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0748-Sanitize-sent-BlockEntity-NBT.patch rename to patches/server/0747-Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0749-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0748-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch similarity index 97% rename from patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch index c9ec6cc4c057..17a6ab001e49 100644 --- a/patches/server/0750-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0749-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3d0f7310840742a5b16f0c0a7115dc0c90202919..45712b358e97b65396f63b34c09debc1d42fdbb9 100644 +index 2476b3fa3ecd976c6f6fb27dc3ad815bbab0165f..455cfdc2ce0960347605e149b88afab5ad8a3b05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -727,6 +727,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0751-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0750-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0752-Dont-resent-entity-on-art-update.patch b/patches/server/0751-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0752-Dont-resent-entity-on-art-update.patch rename to patches/server/0751-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0753-Add-WardenAngerChangeEvent.patch b/patches/server/0752-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0753-Add-WardenAngerChangeEvent.patch rename to patches/server/0752-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0754-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0753-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0755-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0754-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0756-Nameable-Banner-API.patch b/patches/server/0755-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0756-Nameable-Banner-API.patch rename to patches/server/0755-Nameable-Banner-API.patch diff --git a/patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0757-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0756-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0758-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0757-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0759-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0758-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0760-Add-Player-getFishHook.patch b/patches/server/0759-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0760-Add-Player-getFishHook.patch rename to patches/server/0759-Add-Player-getFishHook.patch diff --git a/patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0761-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0760-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 98% rename from patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch index ad1ba5c5406b..a4e7c5b7d4d5 100644 --- a/patches/server/0762-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0761-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45712b358e97b65396f63b34c09debc1d42fdbb9..e5b15ef69bedfd94398f1a8d7a84d0fbf3773919 100644 +index 455cfdc2ce0960347605e149b88afab5ad8a3b05..007e5fc95dd5cb3973f45fd6a435cc102d133728 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2491,6 +2491,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0763-Fix-Bee-flower-NPE.patch b/patches/server/0762-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0763-Fix-Bee-flower-NPE.patch rename to patches/server/0762-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0764-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0763-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0765-More-Teleport-API.patch b/patches/server/0764-More-Teleport-API.patch similarity index 99% rename from patches/server/0765-More-Teleport-API.patch rename to patches/server/0764-More-Teleport-API.patch index aa8880011891..c593fa72c5b3 100644 --- a/patches/server/0765-More-Teleport-API.patch +++ b/patches/server/0764-More-Teleport-API.patch @@ -29,7 +29,7 @@ index 5775d071f714e7b9d959bfa94510b865f489e68e..27eb4bc4d1276ea36b97d0faeed2acee d0 = to.getX(); d1 = to.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a5a9c34709d3bb716e2dc9bb6bd548992df74f46..9ea189c26c6a5fae84bcc7ed098426d8c001cd5e 100644 +index 88e05b8ec5f442b3ad14e3b39a06beeca5c169ae..70c1b20c2b25fbe53255f1753d86570c975767ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -219,15 +219,36 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0766-Add-EntityPortalReadyEvent.patch b/patches/server/0765-Add-EntityPortalReadyEvent.patch similarity index 95% rename from patches/server/0766-Add-EntityPortalReadyEvent.patch rename to patches/server/0765-Add-EntityPortalReadyEvent.patch index 1d064ea6c742..41d4a4e57039 100644 --- a/patches/server/0766-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0765-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e5b15ef69bedfd94398f1a8d7a84d0fbf3773919..45a7b217ab6ef3a7c4ad1c07824d7185d4847086 100644 +index 007e5fc95dd5cb3973f45fd6a435cc102d133728..06fbea11c20db3a1585b969b1578073821c5b316 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2832,6 +2832,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0767-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0766-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0768-Send-block-entities-after-destroy-prediction.patch b/patches/server/0767-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0768-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0767-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0769-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0768-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0770-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0769-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0771-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0770-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0772-Collision-API.patch b/patches/server/0771-Collision-API.patch similarity index 90% rename from patches/server/0772-Collision-API.patch rename to patches/server/0771-Collision-API.patch index da2d02ef43b0..8cc69f84e510 100644 --- a/patches/server/0772-Collision-API.patch +++ b/patches/server/0771-Collision-API.patch @@ -22,13 +22,13 @@ index fbcf1320ef9c1817b24aa8724cd6cf07319c20b9..5680e9772a2d90e997d2d0aacdda9edd // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a47e8994b52576d88fa90b7a86cbe0fb7493fa6d..3cdc8787c6a481da6cb294208eebce0636a58d4f 100644 +index 70c1b20c2b25fbe53255f1753d86570c975767ab..254df37281a358cc0ac99b46f34daf2fd9774d5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1138,4 +1138,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { - this.getHandle().setSharedFlag(Entity.FLAG_INVISIBLE, invisible); +@@ -1148,4 +1148,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return this.getHandle().noPhysics; } - // Paper end - move up invisibility + // Paper end - missing entity api + + // Paper start - Collision API + @Override diff --git a/patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0773-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0772-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0774-Block-Ticking-API.patch b/patches/server/0773-Block-Ticking-API.patch similarity index 100% rename from patches/server/0774-Block-Ticking-API.patch rename to patches/server/0773-Block-Ticking-API.patch diff --git a/patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0775-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0774-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0776-Add-NamespacedKey-biome-methods.patch b/patches/server/0775-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0776-Add-NamespacedKey-biome-methods.patch rename to patches/server/0775-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch similarity index 96% rename from patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch index f27e838474ef..4f2b23f29bf1 100644 --- a/patches/server/0777-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0776-Fix-plugin-loggers-on-server-shutdown.patch @@ -49,7 +49,7 @@ index ab1f4e62b2ffed99b47ae23cae172f20ed586b27..97dbe5a44d2791c6dee830654c3935f4 } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index db6398c1822f6ad499feddd6a915984ef9917777..d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a 100644 +index 44f49cc8b7800eebda426a1a04a311979e4516b9..b131a84865d9160d1b5d411515b69e967dbda66c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -18,6 +18,12 @@ public class Main { diff --git a/patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0778-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0777-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0779-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0778-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0780-Missing-eating-regain-reason.patch b/patches/server/0779-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0780-Missing-eating-regain-reason.patch rename to patches/server/0779-Missing-eating-regain-reason.patch diff --git a/patches/server/0781-Missing-effect-cause.patch b/patches/server/0780-Missing-effect-cause.patch similarity index 100% rename from patches/server/0781-Missing-effect-cause.patch rename to patches/server/0780-Missing-effect-cause.patch diff --git a/patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0782-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0781-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 97% rename from patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch index ff24a5400c96..e097dea832ee 100644 --- a/patches/server/0783-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch +++ b/patches/server/0782-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add a consumer parameter to ProjectileSource#launchProjectile diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 1170cf9b3b61fae099ed8574888187cf4f20ffd1..e559af05c58b7d9c940cea9f48c0f4bd0aad756c 100644 +index a67570fedb8f09a118351b1b5c3d47bc568f5c0c..354c32f67d06228477c723f7e4dbe27116e59a9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -546,8 +546,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0784-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0783-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0784-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0783-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0785-Configurable-chat-thread-limit.patch b/patches/server/0784-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0785-Configurable-chat-thread-limit.patch rename to patches/server/0784-Configurable-chat-thread-limit.patch diff --git a/patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0786-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0785-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0787-fix-Jigsaw-block-kicking-user.patch b/patches/server/0786-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0787-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0786-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0788-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0787-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0789-Add-getDrops-to-BlockState.patch b/patches/server/0788-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0789-Add-getDrops-to-BlockState.patch rename to patches/server/0788-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch index abd857f51470..80d7e8f072e4 100644 --- a/patches/server/0790-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0789-Fix-a-bunch-of-vanilla-bugs.patch @@ -317,7 +317,7 @@ index 56cc6ecf7f95687db7c7c062b4ee979bfe49844b..94dd97662ba07689fbfa16ef5c7d99fe public void equipArmor(Player player, ItemStack stack) { diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 3ff1ae5ae705cd8d5c8529e1dcdd5ccaed908830..0c952bfc01b367a297e81768cab436c5474830f1 100644 +index ab85050a64d4897aff11d0780d8cb26660918ac7..bfb9694087821de206fafe867f207e07a4a6a988 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -282,6 +282,14 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0791-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0790-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0792-Fix-custom-piglin-loved-items.patch b/patches/server/0791-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0792-Fix-custom-piglin-loved-items.patch rename to patches/server/0791-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0793-EntityPickupItemEvent-fixes.patch b/patches/server/0792-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0793-EntityPickupItemEvent-fixes.patch rename to patches/server/0792-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0794-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0793-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0795-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0794-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0796-Elder-Guardian-appearance-API.patch b/patches/server/0795-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0796-Elder-Guardian-appearance-API.patch rename to patches/server/0795-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0797-Allow-changing-bed-s-occupied-property.patch b/patches/server/0796-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0797-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0796-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0798-Add-entity-knockback-API.patch b/patches/server/0797-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0798-Add-entity-knockback-API.patch rename to patches/server/0797-Add-entity-knockback-API.patch diff --git a/patches/server/0799-Detect-headless-JREs.patch b/patches/server/0798-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0799-Detect-headless-JREs.patch rename to patches/server/0798-Detect-headless-JREs.patch diff --git a/patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0800-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0799-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0801-Add-EntityToggleSitEvent.patch b/patches/server/0800-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0801-Add-EntityToggleSitEvent.patch rename to patches/server/0800-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0802-Add-fire-tick-delay-option.patch b/patches/server/0801-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0802-Add-fire-tick-delay-option.patch rename to patches/server/0801-Add-fire-tick-delay-option.patch diff --git a/patches/server/0803-Add-Moving-Piston-API.patch b/patches/server/0802-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0803-Add-Moving-Piston-API.patch rename to patches/server/0802-Add-Moving-Piston-API.patch diff --git a/patches/server/0804-Ignore-impossible-spawn-tick.patch b/patches/server/0803-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0804-Ignore-impossible-spawn-tick.patch rename to patches/server/0803-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0805-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0804-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0806-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0805-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 95% rename from patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index efc81025ac3e..9908d15463fe 100644 --- a/patches/server/0807-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0806-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45a7b217ab6ef3a7c4ad1c07824d7185d4847086..ea65396e55476dc4e91fe2c26a5c5bd658184d5e 100644 +index 06fbea11c20db3a1585b969b1578073821c5b316..3778d900c272a815e67f79c6d2827be2bbe8195f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3111,6 +3111,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0808-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0807-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0808-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0807-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0809-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0808-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 94% rename from patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch index 6f61c8836249..025e7cbceab0 100644 --- a/patches/server/0810-fix-MC-252817-green-map-markers-do-not-disappear.patch +++ b/patches/server/0809-fix-MC-252817-green-map-markers-do-not-disappear.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix MC-252817 (green map markers do not disappear). this bug is caused by the fact that the itemframe's item is set to empty before the green marker is requested to be removed. this is fixed by getting the mapid from this method's parameter, rather than the air block now stored by the item frame. diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 0c952bfc01b367a297e81768cab436c5474830f1..0cd57021cf308984415ca670f727ae61ac343fe7 100644 +index bfb9694087821de206fafe867f207e07a4a6a988..e875196824ef9618a52ca3f172f202d5584990df 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -291,7 +291,9 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0811-Add-Player-Warden-Warning-API.patch b/patches/server/0810-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0811-Add-Player-Warden-Warning-API.patch rename to patches/server/0810-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0812-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0811-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0813-Add-paper-dumplisteners-command.patch b/patches/server/0812-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0813-Add-paper-dumplisteners-command.patch rename to patches/server/0812-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0814-check-global-player-list-where-appropriate.patch b/patches/server/0813-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0814-check-global-player-list-where-appropriate.patch rename to patches/server/0813-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0815-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0814-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0816-ItemStack-damage-API.patch b/patches/server/0815-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0816-ItemStack-damage-API.patch rename to patches/server/0815-ItemStack-damage-API.patch diff --git a/patches/server/0817-Friction-API.patch b/patches/server/0816-Friction-API.patch similarity index 100% rename from patches/server/0817-Friction-API.patch rename to patches/server/0816-Friction-API.patch diff --git a/patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0818-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0817-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0819-Fix-player-kick-on-shutdown.patch b/patches/server/0818-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0819-Fix-player-kick-on-shutdown.patch rename to patches/server/0818-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0820-Sync-offhand-slot-in-menus.patch b/patches/server/0819-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0820-Sync-offhand-slot-in-menus.patch rename to patches/server/0819-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0821-Player-Entity-Tracking-Events.patch b/patches/server/0820-Player-Entity-Tracking-Events.patch similarity index 96% rename from patches/server/0821-Player-Entity-Tracking-Events.patch rename to patches/server/0820-Player-Entity-Tracking-Events.patch index 37d60f62c014..bcba3dec8b26 100644 --- a/patches/server/0821-Player-Entity-Tracking-Events.patch +++ b/patches/server/0820-Player-Entity-Tracking-Events.patch @@ -21,7 +21,7 @@ index 43c8f6a0615f392cc560b2259b116cc9d5fba4e7..ca24463405f138deb882f319bf84696f } else if (this.seenBy.remove(player.connection)) { this.serverEntity.removePairing(player); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ea65396e55476dc4e91fe2c26a5c5bd658184d5e..e7b260c85ce8054f612089be5d39c5df35ab2d88 100644 +index 3778d900c272a815e67f79c6d2827be2bbe8195f..cce640b055932e2fe26800107ad699743324ee4f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3837,7 +3837,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0822-Limit-pet-look-distance.patch b/patches/server/0821-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0822-Limit-pet-look-distance.patch rename to patches/server/0821-Limit-pet-look-distance.patch diff --git a/patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0823-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0822-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0824-fix-Instruments.patch b/patches/server/0823-fix-Instruments.patch similarity index 100% rename from patches/server/0824-fix-Instruments.patch rename to patches/server/0823-fix-Instruments.patch diff --git a/patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0825-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0824-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0826-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0825-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0827-Add-BlockLockCheckEvent.patch b/patches/server/0826-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0827-Add-BlockLockCheckEvent.patch rename to patches/server/0826-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0828-Add-Sneaking-API-for-Entities.patch b/patches/server/0827-Add-Sneaking-API-for-Entities.patch similarity index 91% rename from patches/server/0828-Add-Sneaking-API-for-Entities.patch rename to patches/server/0827-Add-Sneaking-API-for-Entities.patch index 675c2e6539a0..3c82fcadf9ef 100644 --- a/patches/server/0828-Add-Sneaking-API-for-Entities.patch +++ b/patches/server/0827-Add-Sneaking-API-for-Entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Sneaking API for Entities diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index b7fceba1c7138a5c1d78bf058c9f2d32dbc1d292..69dc7d9cc9ebd681d842099e2de521fd11ff5242 100644 +index 254df37281a358cc0ac99b46f34daf2fd9774d5a..b4ed7612a019a3d4d473dfbfed2067ea437fee06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -872,6 +872,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0829-Improve-logging-and-errors.patch b/patches/server/0828-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0829-Improve-logging-and-errors.patch rename to patches/server/0828-Improve-logging-and-errors.patch diff --git a/patches/server/0830-Improve-PortalEvents.patch b/patches/server/0829-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0830-Improve-PortalEvents.patch rename to patches/server/0829-Improve-PortalEvents.patch index c8e1fcfb1fe2..5ba3f4895ab4 100644 --- a/patches/server/0830-Improve-PortalEvents.patch +++ b/patches/server/0829-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e7b260c85ce8054f612089be5d39c5df35ab2d88..c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8 100644 +index cce640b055932e2fe26800107ad699743324ee4f..66266651194cca02bf3814594e6f43b77741808c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3495,7 +3495,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0831-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0830-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0832-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0831-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0833-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0832-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0834-Flying-Fall-Damage.patch b/patches/server/0833-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0834-Flying-Fall-Damage.patch rename to patches/server/0833-Flying-Fall-Damage.patch diff --git a/patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0835-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0834-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 94% rename from patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 02a7125dd433..b9fa91151381 100644 --- a/patches/server/0836-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0835-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c4b925eaa94e48ffa04fb6fb9a5fa61f1d391ec8..d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704 100644 +index 66266651194cca02bf3814594e6f43b77741808c..cf2d4d56dfebeae2baa0712683102b163bdaa9ce 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -957,6 +957,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0837-config-for-disabling-entity-tag-tags.patch b/patches/server/0836-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0837-config-for-disabling-entity-tag-tags.patch rename to patches/server/0836-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0838-Use-single-player-info-update-packet-on-join.patch b/patches/server/0837-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0838-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0837-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0839-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0838-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0840-Win-Screen-API.patch b/patches/server/0839-Win-Screen-API.patch similarity index 100% rename from patches/server/0840-Win-Screen-API.patch rename to patches/server/0839-Win-Screen-API.patch diff --git a/patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0841-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0840-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0842-Fix-force-opening-enchantment-tables.patch b/patches/server/0841-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0842-Fix-force-opening-enchantment-tables.patch rename to patches/server/0841-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0843-Add-Entity-Body-Yaw-API.patch b/patches/server/0842-Add-Entity-Body-Yaw-API.patch similarity index 94% rename from patches/server/0843-Add-Entity-Body-Yaw-API.patch rename to patches/server/0842-Add-Entity-Body-Yaw-API.patch index 526a085ebb9a..87974f97d59f 100644 --- a/patches/server/0843-Add-Entity-Body-Yaw-API.patch +++ b/patches/server/0842-Add-Entity-Body-Yaw-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Entity Body Yaw API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff96911384d 100644 +index b4ed7612a019a3d4d473dfbfed2067ea437fee06..509550bbfb7c6bcff5dffa535f40af12aab898a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1136,6 +1136,31 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -39,7 +39,7 @@ index 034bfd80ea7d1958eba3e057010379bf4b3661c9..dbb463e8aabe4afce6e119f0d91caff9 + } // Paper end - // Paper start - move up invisibility + // Paper start - missing entity api diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index e8ef40fed546608d995fd31dc8a9721c00537749..fbe1d5051f8767db240e4d0c256f4a1088c4339c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0844-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0843-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0845-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0844-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0846-Add-EntityFertilizeEggEvent.patch b/patches/server/0845-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0846-Add-EntityFertilizeEggEvent.patch rename to patches/server/0845-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0847-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0846-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0848-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0847-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0849-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0848-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0850-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0849-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0851-Fix-text-display-error-on-spawn.patch b/patches/server/0850-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0851-Fix-text-display-error-on-spawn.patch rename to patches/server/0850-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0852-Fix-inventories-returning-null-Locations.patch b/patches/server/0851-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0852-Fix-inventories-returning-null-Locations.patch rename to patches/server/0851-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0853-Add-Shearable-API.patch b/patches/server/0852-Add-Shearable-API.patch similarity index 100% rename from patches/server/0853-Add-Shearable-API.patch rename to patches/server/0852-Add-Shearable-API.patch diff --git a/patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0854-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0853-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0855-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0854-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0856-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0855-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0856-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0855-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0857-remove-duplicate-animate-packet-for-records.patch b/patches/server/0856-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0857-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0856-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0858-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0857-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0859-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0858-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0860-Use-array-for-gamerule-storage.patch b/patches/server/0859-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0860-Use-array-for-gamerule-storage.patch rename to patches/server/0859-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0861-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0860-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0862-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0861-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0863-Add-Mob-Experience-reward-API.patch b/patches/server/0862-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0863-Add-Mob-Experience-reward-API.patch rename to patches/server/0862-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0864-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0863-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0865-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0864-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0866-More-accurate-isInOpenWater-impl.patch b/patches/server/0865-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0866-More-accurate-isInOpenWater-impl.patch rename to patches/server/0865-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0867-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0866-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0868-Expand-PlayerItemMendEvent.patch b/patches/server/0867-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0868-Expand-PlayerItemMendEvent.patch rename to patches/server/0867-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch similarity index 97% rename from patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch index 1e23e270a4f4..1dabec492f5d 100644 --- a/patches/server/0869-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0868-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d24c2e23a12a196e1f6dc4f5c6d3c69472ddc704..c173ecd1283331afcf4db010e65764e5ed6e1eff 100644 +index cf2d4d56dfebeae2baa0712683102b163bdaa9ce..0479dbdf0da7a06735ee08d068ead5fa12fc9860 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0870-Add-transient-modifier-API.patch b/patches/server/0869-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0870-Add-transient-modifier-API.patch rename to patches/server/0869-Add-transient-modifier-API.patch diff --git a/patches/server/0871-Fix-block-place-logic.patch b/patches/server/0870-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0871-Fix-block-place-logic.patch rename to patches/server/0870-Fix-block-place-logic.patch diff --git a/patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0872-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0871-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0873-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0872-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0874-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0873-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0875-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0874-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0876-Fix-sniffer-removeExploredLocation.patch b/patches/server/0875-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0876-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0875-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch index 20554be56919..d2aa5b28fdb3 100644 --- a/patches/server/0877-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/server/0876-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 3302d8e9b7c2c48b20dd257f4699b263d3bc52dc..3f952d1409118535f325f614f1a6507c40efa4d6 100644 +index fbe1d5051f8767db240e4d0c256f4a1088c4339c..993844ee3d76591be38e8d27eba37ff8723443b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -540,6 +540,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0878-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0877-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0879-Add-event-for-player-editing-sign.patch b/patches/server/0878-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0879-Add-event-for-player-editing-sign.patch rename to patches/server/0878-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0880-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0879-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0881-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0880-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0882-Add-option-to-disable-block-updates.patch b/patches/server/0881-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0882-Add-option-to-disable-block-updates.patch rename to patches/server/0881-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0883-Call-missing-BlockDispenseEvent.patch b/patches/server/0882-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0883-Call-missing-BlockDispenseEvent.patch rename to patches/server/0882-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 90% rename from patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch index 2fc45560a68d..925e5e90ff32 100644 --- a/patches/server/0884-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/server/0883-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c173ecd1283331afcf4db010e65764e5ed6e1eff..626f2180b87daa1c00e97dc24b1a78aec4d9f033 100644 +index 0479dbdf0da7a06735ee08d068ead5fa12fc9860..927c298c1922fdd1016ffc72d2ca196adaccd377 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1200,7 +1200,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0885-Optimize-player-lookups-for-beacons.patch b/patches/server/0884-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0885-Optimize-player-lookups-for-beacons.patch rename to patches/server/0884-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0886-Add-Sign-getInteractableSideFor.patch b/patches/server/0885-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0886-Add-Sign-getInteractableSideFor.patch rename to patches/server/0885-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0887-Array-backed-synched-entity-data.patch b/patches/server/0886-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0887-Array-backed-synched-entity-data.patch rename to patches/server/0886-Array-backed-synched-entity-data.patch diff --git a/patches/server/0888-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0887-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0888-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0887-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0889-Fix-BanList-API.patch b/patches/server/0888-Fix-BanList-API.patch similarity index 100% rename from patches/server/0889-Fix-BanList-API.patch rename to patches/server/0888-Fix-BanList-API.patch diff --git a/patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0890-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0889-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0891-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0890-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0891-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0890-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0892-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0891-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0893-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0892-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0894-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0893-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0895-Add-whitelist-events.patch b/patches/server/0894-Add-whitelist-events.patch similarity index 100% rename from patches/server/0895-Add-whitelist-events.patch rename to patches/server/0894-Add-whitelist-events.patch diff --git a/patches/server/0896-Implement-PlayerFailMoveEvent.patch b/patches/server/0895-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0896-Implement-PlayerFailMoveEvent.patch rename to patches/server/0895-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0897-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0896-Folia-scheduler-and-owned-region-API.patch index ec5f0abb4d6e..92d708382e11 100644 --- a/patches/server/0897-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0896-Folia-scheduler-and-owned-region-API.patch @@ -1185,7 +1185,7 @@ index 0747b0042446271385371f1ca9c8fefdebd851b8..fade1e36037075aae968eb90bbfeac76 this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 626f2180b87daa1c00e97dc24b1a78aec4d9f033..abbd6a866b666978ce29211e4027f2b08b0c2e3d 100644 +index 927c298c1922fdd1016ffc72d2ca196adaccd377..ecd7deadbddeb9571b2b8975214e4167c8333ce0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -1332,7 +1332,7 @@ index 56a6b3921c74bdeb27f8736302503bee1f731065..b5140b37d2161d89c6c5d6465949e96f ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); ConfigurationSerialization.registerClass(CraftPlayerProfile.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index ba915f1b3cd00c8afe39ece9c9e68737673777f5..282a1cebc0cdb6253d024dd399ef794335883662 100644 +index 509550bbfb7c6bcff5dffa535f40af12aab898a8..8086eae45b03fd53bc7cac625b51fc10d8523f4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -68,6 +68,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0898-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0897-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0899-API-for-updating-recipes-on-clients.patch b/patches/server/0898-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0899-API-for-updating-recipes-on-clients.patch rename to patches/server/0898-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0900-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0899-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0900-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0899-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0901-Only-capture-actual-tree-growth.patch b/patches/server/0900-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0901-Only-capture-actual-tree-growth.patch rename to patches/server/0900-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0902-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0901-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0903-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0902-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0904-Use-correct-seed-on-api-world-load.patch b/patches/server/0903-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0904-Use-correct-seed-on-api-world-load.patch rename to patches/server/0903-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0905-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0904-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0906-Cache-map-ids-on-item-frames.patch b/patches/server/0905-Cache-map-ids-on-item-frames.patch similarity index 96% rename from patches/server/0906-Cache-map-ids-on-item-frames.patch rename to patches/server/0905-Cache-map-ids-on-item-frames.patch index a65e4d702190..7966ccb012d0 100644 --- a/patches/server/0906-Cache-map-ids-on-item-frames.patch +++ b/patches/server/0905-Cache-map-ids-on-item-frames.patch @@ -18,7 +18,7 @@ index 1f0931bdd4d82c05d7b5f8b8e5c2cc6d23905c73..da45984c9b2d3a55256efddde9458050 if (worldmap != null) { diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 0cd57021cf308984415ca670f727ae61ac343fe7..80303f9466b8c7097151be313afc9a383693d18a 100644 +index e875196824ef9618a52ca3f172f202d5584990df..c34701f95580e4cf45fe086115563127432a28c5 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java @@ -50,6 +50,7 @@ public class ItemFrame extends HangingEntity { diff --git a/patches/server/0907-Fix-custom-statistic-criteria-creation.patch b/patches/server/0906-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0907-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0906-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0908-Bandaid-fix-for-Effect.patch b/patches/server/0907-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0908-Bandaid-fix-for-Effect.patch rename to patches/server/0907-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0909-SculkCatalyst-bloom-API.patch b/patches/server/0908-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0909-SculkCatalyst-bloom-API.patch rename to patches/server/0908-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch similarity index 86% rename from patches/server/0910-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0909-API-for-an-entity-s-scoreboard-name.patch index a93b609b72ae..dbff93ae5654 100644 --- a/patches/server/0910-API-for-an-entity-s-scoreboard-name.patch +++ b/patches/server/0909-API-for-an-entity-s-scoreboard-name.patch @@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different methods depending on the implementation of Entity you were working with. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 1de3a2ed64dcd222bc90d3917c08e12af56450b4..fd7a3176cdd07f50e4e56d98827672042cdf5944 100644 +index 8086eae45b03fd53bc7cac625b51fc10d8523f4f..d91d56175e91fb06138901bad56c1c2544b3d20e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1206,4 +1206,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1216,4 +1216,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return !this.getHandle().level().noCollision(this.getHandle(), aabb); } // Paper end - Collision API diff --git a/patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0911-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0910-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0912-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0911-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0913-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0912-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0914-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0913-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0915-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0914-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0916-Add-Listing-API-for-Player.patch b/patches/server/0915-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0916-Add-Listing-API-for-Player.patch rename to patches/server/0915-Add-Listing-API-for-Player.patch diff --git a/patches/server/0917-Configurable-Region-Compression-Format.patch b/patches/server/0916-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0917-Configurable-Region-Compression-Format.patch rename to patches/server/0916-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0918-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0917-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0919-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0918-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0919-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0918-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0920-Expand-Pose-API.patch b/patches/server/0919-Expand-Pose-API.patch similarity index 91% rename from patches/server/0920-Expand-Pose-API.patch rename to patches/server/0919-Expand-Pose-API.patch index 660dffd43c40..33bb7d2bc781 100644 --- a/patches/server/0920-Expand-Pose-API.patch +++ b/patches/server/0919-Expand-Pose-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8871739a1 100644 +index ecd7deadbddeb9571b2b8975214e4167c8333ce0..4db254f76bc2fb9867441016b3ac4f45f19d3bea 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -419,6 +419,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -25,7 +25,7 @@ index abbd6a866b666978ce29211e4027f2b08b0c2e3d..bbc3f09105b19eabd3ebb8b9589412b8 if (pose == this.getPose()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index fec2f96cfc42559c44d5d2e907d0706c674dfda7..089eb25d532990773161063658f123f1e5bef2b3 100644 +index d91d56175e91fb06138901bad56c1c2544b3d20e..a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -897,6 +897,20 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0921-More-DragonBattle-API.patch b/patches/server/0920-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0921-More-DragonBattle-API.patch rename to patches/server/0920-More-DragonBattle-API.patch diff --git a/patches/server/0922-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0921-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/0922-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0921-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/0923-Add-PlayerPickItemEvent.patch b/patches/server/0922-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0923-Add-PlayerPickItemEvent.patch rename to patches/server/0922-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0924-Allow-trident-custom-damage.patch b/patches/server/0923-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0924-Allow-trident-custom-damage.patch rename to patches/server/0923-Allow-trident-custom-damage.patch diff --git a/patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0925-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0924-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0926-Optimize-nearest-structure-border-iteration.patch b/patches/server/0925-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0926-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0925-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0927-Implement-OfflinePlayer-isConnected.patch b/patches/server/0926-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/0927-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0926-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/0928-Fix-inventory-desync.patch b/patches/server/0927-Fix-inventory-desync.patch similarity index 100% rename from patches/server/0928-Fix-inventory-desync.patch rename to patches/server/0927-Fix-inventory-desync.patch diff --git a/patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/0929-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0928-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/0930-Configure-sniffer-egg-hatch-time.patch b/patches/server/0929-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0930-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0929-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0931-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0930-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0932-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0931-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0933-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0932-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0934-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0933-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0935-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0934-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0936-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0935-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0936-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0935-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0937-Fix-spigot-s-Forced-Stats.patch b/patches/server/0936-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0937-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0936-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0938-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0937-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0939-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0938-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0940-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0939-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/0941-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/0940-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0942-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0941-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0943-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0942-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0944-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0943-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0945-Fix-missing-map-initialize-event-call.patch b/patches/server/0944-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0945-Fix-missing-map-initialize-event-call.patch rename to patches/server/0944-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0946-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0945-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/0947-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/0946-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0948-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0947-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0949-Add-player-idle-duration-API.patch b/patches/server/0948-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0949-Add-player-idle-duration-API.patch rename to patches/server/0948-Add-player-idle-duration-API.patch diff --git a/patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0950-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0949-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0951-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0950-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0952-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0951-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0953-Optimize-VarInts.patch b/patches/server/0952-Optimize-VarInts.patch similarity index 100% rename from patches/server/0953-Optimize-VarInts.patch rename to patches/server/0952-Optimize-VarInts.patch diff --git a/patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0954-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0953-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0955-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0954-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0956-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0955-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0957-Expand-LingeringPotion-API.patch b/patches/server/0956-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0957-Expand-LingeringPotion-API.patch rename to patches/server/0956-Expand-LingeringPotion-API.patch diff --git a/patches/server/0958-Add-MaterialTagsTest.patch b/patches/server/0957-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/0958-Add-MaterialTagsTest.patch rename to patches/server/0957-Add-MaterialTagsTest.patch diff --git a/patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0959-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0958-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0960-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0959-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0961-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0960-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0962-Add-UUID-attribute-modifier-API.patch b/patches/server/0961-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0962-Add-UUID-attribute-modifier-API.patch rename to patches/server/0961-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 93% rename from patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch index 1d122c2f1596..7da83443f13d 100644 --- a/patches/server/0963-Fix-missing-event-call-for-entity-teleport-API.patch +++ b/patches/server/0962-Fix-missing-event-call-for-entity-teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing event call for entity teleport API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 089eb25d532990773161063658f123f1e5bef2b3..9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535 100644 +index a81c8a9d76c1d9fdee19132a9a40ffc2ab4d107e..38c14e06bcada9678b64c6eacf351de10232ee56 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -256,6 +256,17 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/0964-Lazily-create-LootContext-for-criterions.patch b/patches/server/0963-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0964-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0963-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch similarity index 99% rename from patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch index 2654c1f60d65..58ccbc1f04ad 100644 --- a/patches/server/0965-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/server/0964-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 8235dace0f4a1090dfbd403db34231ccafe5f30e..9816913ad729fd39c173364b92e5db06 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 919c9ff3dd97d4bd2d41631176f9671f1987ad91..1de77621f159608f572ab4935ceb78863bb82c59 100644 +index 4db254f76bc2fb9867441016b3ac4f45f19d3bea..4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -637,7 +637,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0966-Add-Structure-check-API.patch b/patches/server/0965-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0966-Add-Structure-check-API.patch rename to patches/server/0965-Add-Structure-check-API.patch diff --git a/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0966-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch similarity index 99% rename from patches/server/0968-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0967-Restore-vanilla-entity-drops-behavior.patch index e6db1df6807c..a82abb42715c 100644 --- a/patches/server/0968-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0967-Restore-vanilla-entity-drops-behavior.patch @@ -50,7 +50,7 @@ index 7272dc058c575efee5ac2643ce41b7d12e346e89..ae5a2136a0e266d4c35190f5d3355299 if (entityitem == null) { return null; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1de77621f159608f572ab4935ceb78863bb82c59..5ab9ca815cb324c47c3e25a4d84a1b432bb393be 100644 +index 4125802dda07d79dd0e1f7e7dc3c0ee85fa0383c..7c99742e01e894bcc7d89a8588b2f128cf9b765d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2496,6 +2496,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0969-Dont-resend-blocks-on-interactions.patch b/patches/server/0968-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0969-Dont-resend-blocks-on-interactions.patch rename to patches/server/0968-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0970-add-more-scoreboard-API.patch b/patches/server/0969-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0970-add-more-scoreboard-API.patch rename to patches/server/0969-add-more-scoreboard-API.patch diff --git a/patches/server/0971-Improve-Registry.patch b/patches/server/0970-Improve-Registry.patch similarity index 100% rename from patches/server/0971-Improve-Registry.patch rename to patches/server/0970-Improve-Registry.patch diff --git a/patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0972-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0971-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0973-Add-experience-points-API.patch b/patches/server/0972-Add-experience-points-API.patch similarity index 100% rename from patches/server/0973-Add-experience-points-API.patch rename to patches/server/0972-Add-experience-points-API.patch diff --git a/patches/server/0974-Add-drops-to-shear-events.patch b/patches/server/0973-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0974-Add-drops-to-shear-events.patch rename to patches/server/0973-Add-drops-to-shear-events.patch diff --git a/patches/server/0975-Add-PlayerShieldDisableEvent.patch b/patches/server/0974-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0975-Add-PlayerShieldDisableEvent.patch rename to patches/server/0974-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0976-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0975-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0977-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0976-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0978-Fixup-NamespacedKey-handling.patch b/patches/server/0977-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0978-Fixup-NamespacedKey-handling.patch rename to patches/server/0977-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0979-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0978-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0979-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0978-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0980-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0979-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0981-Rewrite-dataconverter-system.patch b/patches/server/0980-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0981-Rewrite-dataconverter-system.patch rename to patches/server/0980-Rewrite-dataconverter-system.patch diff --git a/patches/server/0982-Starlight.patch b/patches/server/0981-Starlight.patch similarity index 100% rename from patches/server/0982-Starlight.patch rename to patches/server/0981-Starlight.patch diff --git a/patches/server/0983-Rewrite-chunk-system.patch b/patches/server/0982-Rewrite-chunk-system.patch similarity index 99% rename from patches/server/0983-Rewrite-chunk-system.patch rename to patches/server/0982-Rewrite-chunk-system.patch index 2a35933defa5..12bc4a8ec8c9 100644 --- a/patches/server/0983-Rewrite-chunk-system.patch +++ b/patches/server/0982-Rewrite-chunk-system.patch @@ -19375,7 +19375,7 @@ index 640db9f71608310a64e09f1e3e677c01e6ccd98a..f2a7cb6ebed7a4b4019a09af2a025f62 if (flag1) { ++this.converted; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5ab9ca815cb324c47c3e25a4d84a1b432bb393be..42d01cec6eba11183409c9a93d068e61f5010153 100644 +index 7c99742e01e894bcc7d89a8588b2f128cf9b765d..3f620c4b8415f09a8d4664481b2d41d421ee836e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -480,6 +480,58 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0984-incremental-chunk-and-player-saving.patch b/patches/server/0983-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0984-incremental-chunk-and-player-saving.patch rename to patches/server/0983-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0984-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0985-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0986-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0987-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0988-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0990-Fix-World-isChunkGenerated-calls.patch b/patches/server/0989-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0990-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0989-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0991-Flat-bedrock-generator-settings.patch b/patches/server/0990-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0991-Flat-bedrock-generator-settings.patch rename to patches/server/0990-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0992-Entity-Activation-Range-2.0.patch b/patches/server/0991-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0992-Entity-Activation-Range-2.0.patch rename to patches/server/0991-Entity-Activation-Range-2.0.patch index 4bec5ca13e9f..fd890e743255 100644 --- a/patches/server/0992-Entity-Activation-Range-2.0.patch +++ b/patches/server/0991-Entity-Activation-Range-2.0.patch @@ -111,7 +111,7 @@ index bd8c96e914b156284bdbb960f168e63e1f122920..abb4c32e8b35de332fa517523e8c598e } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 42d01cec6eba11183409c9a93d068e61f5010153..1f892783c16ab8fd863832255a2b03df381aa84e 100644 +index 3f620c4b8415f09a8d4664481b2d41d421ee836e..703b32362cf6a23dfe9326aa4e0ee74511e0d2cb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -412,6 +412,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0993-Optional-per-player-mob-spawns.patch b/patches/server/0992-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0993-Optional-per-player-mob-spawns.patch rename to patches/server/0992-Optional-per-player-mob-spawns.patch diff --git a/patches/server/0994-Anti-Xray.patch b/patches/server/0993-Anti-Xray.patch similarity index 100% rename from patches/server/0994-Anti-Xray.patch rename to patches/server/0993-Anti-Xray.patch diff --git a/patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0995-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0996-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0995-Optimize-Collision-to-not-load-chunks.patch index 2ad06277cb7c..b992c3fadfa3 100644 --- a/patches/server/0996-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0995-Optimize-Collision-to-not-load-chunks.patch @@ -26,7 +26,7 @@ index 461c27292af06a5150de8ec263d0c8527e8c5278..37245ff682837e7e8c9647f4afe30f0d // CraftBukkit end entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1f892783c16ab8fd863832255a2b03df381aa84e..720d08400915da9270ee4abf84bcb73f354ae2b4 100644 +index 703b32362cf6a23dfe9326aa4e0ee74511e0d2cb..8531304667a85436fd557d319fe36a37b3661ae5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -242,6 +242,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0997-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0996-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0998-Entity-load-save-limit-per-chunk.patch b/patches/server/0997-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0998-Entity-load-save-limit-per-chunk.patch rename to patches/server/0997-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0999-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0998-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0999-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0998-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/1000-Improved-Watchdog-Support.patch b/patches/server/0999-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/1000-Improved-Watchdog-Support.patch rename to patches/server/0999-Improved-Watchdog-Support.patch diff --git a/patches/server/1001-Optimize-Voxel-Shape-Merging.patch b/patches/server/1000-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1001-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1000-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1002-Write-SavedData-IO-async.patch b/patches/server/1001-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1002-Write-SavedData-IO-async.patch rename to patches/server/1001-Write-SavedData-IO-async.patch diff --git a/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/1002-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch index be6acff7e69b..986378b88fa4 100644 --- a/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/1003-Use-distance-map-to-optimise-entity-tracker.patch @@ -236,7 +236,7 @@ index ac1a4ff5f83e53fa2983ff6e834775e51fba715e..284f9548d62f9230c668bb1adb8cb808 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 720d08400915da9270ee4abf84bcb73f354ae2b4..28ca0aae8f8c755b558a03fc9283fa1a44697e1a 100644 +index 8531304667a85436fd557d319fe36a37b3661ae5..f220e9ba35b07b690df93b1d733e9c666c772de9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1005-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1004-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1006-Remove-streams-from-hot-code.patch b/patches/server/1005-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1006-Remove-streams-from-hot-code.patch rename to patches/server/1005-Remove-streams-from-hot-code.patch diff --git a/patches/server/1007-Eigencraft-redstone-implementation.patch b/patches/server/1006-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1007-Eigencraft-redstone-implementation.patch rename to patches/server/1006-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1007-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/1009-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/1008-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/1010-Improve-boat-collision-performance.patch b/patches/server/1009-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/1010-Improve-boat-collision-performance.patch rename to patches/server/1009-Improve-boat-collision-performance.patch diff --git a/patches/server/1011-Optimise-general-POI-access.patch b/patches/server/1010-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1011-Optimise-general-POI-access.patch rename to patches/server/1010-Optimise-general-POI-access.patch diff --git a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/1013-Execute-chunk-tasks-mid-tick.patch rename to patches/server/1012-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/1014-Optimise-random-block-ticking.patch b/patches/server/1013-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/1014-Optimise-random-block-ticking.patch rename to patches/server/1013-Optimise-random-block-ticking.patch diff --git a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/1017-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1016-Detail-more-information-in-watchdog-dumps.patch index 710f25f69b0f..bf520606cb69 100644 --- a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch @@ -122,7 +122,7 @@ index 9d18da228c6709e7665ba8babb6ee6d0b36b5dc5..af9f58328c09dddb2875f79128f906b8 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 28ca0aae8f8c755b558a03fc9283fa1a44697e1a..ec01a97cac653fb1a2065289fe5b0c6824732bcb 100644 +index f220e9ba35b07b690df93b1d733e9c666c772de9..c1a8de736ee39e4e177399bc51aedfd135a8100d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1063,8 +1063,43 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1018-Collision-optimisations.patch b/patches/server/1017-Collision-optimisations.patch similarity index 99% rename from patches/server/1018-Collision-optimisations.patch rename to patches/server/1017-Collision-optimisations.patch index c57de0cfdf9b..de992f75eee2 100644 --- a/patches/server/1018-Collision-optimisations.patch +++ b/patches/server/1017-Collision-optimisations.patch @@ -2214,7 +2214,7 @@ index 594cb6ce4bfa6c42212000a1ed983ea95ee2c4bf..97b0119ac71284b3a223c089bec26d87 entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ec01a97cac653fb1a2065289fe5b0c6824732bcb..be2220457e941803b14d78c550d0db777c79a886 100644 +index c1a8de736ee39e4e177399bc51aedfd135a8100d..6de971aca46caad091271d125a079a1b7a5f163d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1250,9 +1250,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch similarity index 100% rename from patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch rename to patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch diff --git a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1022-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1021-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1023-optimize-dirt-and-snow-spreading.patch b/patches/server/1022-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/1023-optimize-dirt-and-snow-spreading.patch rename to patches/server/1022-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/1024-Properly-resend-entities.patch b/patches/server/1023-Properly-resend-entities.patch similarity index 99% rename from patches/server/1024-Properly-resend-entities.patch rename to patches/server/1023-Properly-resend-entities.patch index a00f094df794..f0d407671bb9 100644 --- a/patches/server/1024-Properly-resend-entities.patch +++ b/patches/server/1023-Properly-resend-entities.patch @@ -180,7 +180,7 @@ index a1bfd700cd4c39e4bb1b9c140b54b7c82cd8b32c..205b52e486123aa23a1469de896ab1ec } entity.playSound(((Bucketable) entity).getPickupSound(), 1.0F, 1.0F); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 9f657dc4075ce01c3a8f871c4a60e5ca5d8eb535..0b5a31477e3b76833fb97a455842316193663c8e 100644 +index 38c14e06bcada9678b64c6eacf351de10232ee56..7cd7912cecbbbe2c32bfd9b85181115c6d316eb8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1000,7 +1000,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/server/1025-Optimize-Hoppers.patch b/patches/server/1024-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1025-Optimize-Hoppers.patch rename to patches/server/1024-Optimize-Hoppers.patch diff --git a/patches/server/1026-Improve-performance-of-mass-crafts.patch b/patches/server/1025-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1026-Improve-performance-of-mass-crafts.patch rename to patches/server/1025-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1027-Actually-optimise-explosions.patch b/patches/server/1026-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1027-Actually-optimise-explosions.patch rename to patches/server/1026-Actually-optimise-explosions.patch diff --git a/patches/server/1028-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1028-Optimise-chunk-tick-iteration.patch rename to patches/server/1027-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch similarity index 100% rename from patches/server/1029-Lag-compensation-ticks.patch rename to patches/server/1028-Lag-compensation-ticks.patch diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1030-Optimise-nearby-player-retrieval.patch rename to patches/server/1029-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1031-Distance-manager-tick-timings.patch b/patches/server/1030-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/1031-Distance-manager-tick-timings.patch rename to patches/server/1030-Distance-manager-tick-timings.patch diff --git a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/1034-Add-ShulkerDuplicateEvent.patch b/patches/server/1033-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/1034-Add-ShulkerDuplicateEvent.patch rename to patches/server/1033-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/1035-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/1034-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/1036-Disable-memory-reserve-allocating.patch b/patches/server/1035-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/1036-Disable-memory-reserve-allocating.patch rename to patches/server/1035-Disable-memory-reserve-allocating.patch diff --git a/patches/server/1037-Improve-tag-parser-handling.patch b/patches/server/1036-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/1037-Improve-tag-parser-handling.patch rename to patches/server/1036-Improve-tag-parser-handling.patch diff --git a/patches/server/1038-Add-Lifecycle-Event-system.patch b/patches/server/1037-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/1038-Add-Lifecycle-Event-system.patch rename to patches/server/1037-Add-Lifecycle-Event-system.patch diff --git a/patches/server/1039-Conduit-API.patch b/patches/server/1038-Conduit-API.patch similarity index 100% rename from patches/server/1039-Conduit-API.patch rename to patches/server/1038-Conduit-API.patch diff --git a/patches/server/1040-ItemStack-Tooltip-API.patch b/patches/server/1039-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/1040-ItemStack-Tooltip-API.patch rename to patches/server/1039-ItemStack-Tooltip-API.patch diff --git a/patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch similarity index 100% rename from patches/server/1041-Fix-possible-StackOverflowError-for-some-dispenses.patch rename to patches/server/1040-Fix-possible-StackOverflowError-for-some-dispenses.patch diff --git a/patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/1042-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/1041-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/1043-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/1042-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/1044-Add-FluidState-API.patch b/patches/server/1043-Add-FluidState-API.patch similarity index 100% rename from patches/server/1044-Add-FluidState-API.patch rename to patches/server/1043-Add-FluidState-API.patch diff --git a/patches/server/1045-add-number-format-api.patch b/patches/server/1044-add-number-format-api.patch similarity index 100% rename from patches/server/1045-add-number-format-api.patch rename to patches/server/1044-add-number-format-api.patch diff --git a/patches/server/1046-check-if-itemstack-is-stackable-first.patch b/patches/server/1045-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/1046-check-if-itemstack-is-stackable-first.patch rename to patches/server/1045-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/1047-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/1046-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/1048-improve-BanList-types.patch b/patches/server/1047-improve-BanList-types.patch similarity index 100% rename from patches/server/1048-improve-BanList-types.patch rename to patches/server/1047-improve-BanList-types.patch diff --git a/patches/server/1049-Configurable-max-block-fluid-ticks.patch b/patches/server/1048-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/1049-Configurable-max-block-fluid-ticks.patch rename to patches/server/1048-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/1050-disable-forced-empty-world-ticks.patch b/patches/server/1049-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/1050-disable-forced-empty-world-ticks.patch rename to patches/server/1049-disable-forced-empty-world-ticks.patch diff --git a/patches/server/1051-Suspicious-Effect-Entry-API.patch b/patches/server/1050-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/1051-Suspicious-Effect-Entry-API.patch rename to patches/server/1050-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/1052-Per-world-ticks-per-spawn-settings.patch b/patches/server/1051-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/1052-Per-world-ticks-per-spawn-settings.patch rename to patches/server/1051-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/1053-Add-onboarding-message-for-initial-server-start.patch b/patches/server/1052-Add-onboarding-message-for-initial-server-start.patch similarity index 100% rename from patches/server/1053-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/1052-Add-onboarding-message-for-initial-server-start.patch diff --git a/patches/server/1054-Fix-DamageSource-API.patch b/patches/server/1053-Fix-DamageSource-API.patch similarity index 99% rename from patches/server/1054-Fix-DamageSource-API.patch rename to patches/server/1053-Fix-DamageSource-API.patch index 3c80fe5209ea..b775177307dc 100644 --- a/patches/server/1054-Fix-DamageSource-API.patch +++ b/patches/server/1053-Fix-DamageSource-API.patch @@ -44,7 +44,7 @@ index 1561b85a45f52a8162f43553f8485bfe084b8f1f..b26e4d58ea1898a5e4b31c3d6ab33f38 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index be2220457e941803b14d78c550d0db777c79a886..f5a86c0fb1a7a313afc4c56ffc445a7fe7821428 100644 +index 6de971aca46caad091271d125a079a1b7a5f163d..b2eff51f1ad1e702525ef298807ea7d2083f6218 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3462,7 +3462,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/1055-Expanded-Hopper-API.patch b/patches/server/1054-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/1055-Expanded-Hopper-API.patch rename to patches/server/1054-Expanded-Hopper-API.patch From 00fd87a10fcdfa86db341c051b006303fe068b55 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 25 Mar 2024 13:26:01 +0100 Subject: [PATCH 14/16] Return dummy string instead of empty optional --- .../1036-Improve-tag-parser-handling.patch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/patches/server/1036-Improve-tag-parser-handling.patch b/patches/server/1036-Improve-tag-parser-handling.patch index 7be702c88c83..b5f2c9c42d24 100644 --- a/patches/server/1036-Improve-tag-parser-handling.patch +++ b/patches/server/1036-Improve-tag-parser-handling.patch @@ -123,31 +123,32 @@ index 5bec54239a2b185284c10d58854e5a13e33daae5..94cb73e7f60171aa57bd1dbe7e91ef4d + } } diff --git a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java -index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..084ffde43447f6ff5e45e9fe3fc6a86bde65fd5a 100644 +index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..981d34dd4cfbc0932b147688751b98552c8beea8 100644 --- a/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java +++ b/src/main/java/net/minecraft/network/chat/contents/TranslatableContents.java @@ -197,6 +197,15 @@ public class TranslatableContents implements ComponentContents { @Override public Optional visit(FormattedText.ContentConsumer visitor) { -+ // Paper start ++ // Paper start - Count visited parts + try { + return this.visit(new TranslatableContentConsumer<>(visitor)); -+ } catch (IllegalArgumentException var5) { -+ return Optional.empty(); ++ } catch (IllegalArgumentException ignored) { ++ return visitor.accept("..."); + } + } + private Optional visit(TranslatableContentConsumer visitor) { -+ // Paper end ++ // Paper end - Count visited parts this.decompose(); for(FormattedText formattedText : this.decomposedParts) { -@@ -208,6 +217,24 @@ public class TranslatableContents implements ComponentContents { +@@ -208,6 +217,25 @@ public class TranslatableContents implements ComponentContents { return Optional.empty(); } -+ // Paper start ++ // Paper start - Count visited parts + private static final class TranslatableContentConsumer implements FormattedText.ContentConsumer { ++ private static final IllegalArgumentException EX = new IllegalArgumentException("Too long"); + private final FormattedText.ContentConsumer visitor; + private int visited; + @@ -158,12 +159,12 @@ index d45e39bc009281c298f3dfae113dc87f2b3b1fbd..084ffde43447f6ff5e45e9fe3fc6a86b + @Override + public Optional accept(final String asString) { + if (visited++ > 32) { -+ throw new IllegalArgumentException("Too long"); ++ throw EX; + } + return this.visitor.accept(asString); + } + } -+ // Paper end ++ // Paper end - Count visited parts @Override public MutableComponent resolve(@Nullable CommandSourceStack source, @Nullable Entity sender, int depth) throws CommandSyntaxException { From 710dced8b70c995656a24479f9453676cf6164fc Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 26 Mar 2024 08:38:26 -0700 Subject: [PATCH 15/16] [ci skip] move custom brig exception to paper package --- .../1036-Improve-tag-parser-handling.patch | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/patches/server/1036-Improve-tag-parser-handling.patch b/patches/server/1036-Improve-tag-parser-handling.patch index b5f2c9c42d24..e2c46e261e6c 100644 --- a/patches/server/1036-Improve-tag-parser-handling.patch +++ b/patches/server/1036-Improve-tag-parser-handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve tag parser handling diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java -index 92848b64a78fce7a92e1657c2da6fc5ee53eea44..5d5562676a77259b875e15b744b53258533851a7 100644 +index 92848b64a78fce7a92e1657c2da6fc5ee53eea44..4b4f812eb13d5f03bcf3f8724d8aa8dbbc724e8b 100644 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java @@ -304,9 +304,15 @@ public class CommandDispatcher { @@ -17,7 +17,7 @@ index 92848b64a78fce7a92e1657c2da6fc5ee53eea44..5d5562676a77259b875e15b744b53258 try { child.parse(reader, context); + // Paper start - Handle non-recoverable exceptions -+ } catch (final com.mojang.brigadier.exceptions.TagParseCommandSyntaxException e) { ++ } catch (final io.papermc.paper.brigadier.TagParseCommandSyntaxException e) { + stop = true; + throw e; + // Paper end - Handle non-recoverable exceptions @@ -32,15 +32,17 @@ index 92848b64a78fce7a92e1657c2da6fc5ee53eea44..5d5562676a77259b875e15b744b53258 continue; } -diff --git a/src/main/java/com/mojang/brigadier/exceptions/TagParseCommandSyntaxException.java b/src/main/java/com/mojang/brigadier/exceptions/TagParseCommandSyntaxException.java +diff --git a/src/main/java/io/papermc/paper/brigadier/TagParseCommandSyntaxException.java b/src/main/java/io/papermc/paper/brigadier/TagParseCommandSyntaxException.java new file mode 100644 -index 0000000000000000000000000000000000000000..bf248a215dc69bb303c836112309471aab687e23 +index 0000000000000000000000000000000000000000..a375ad4ba9db990b24a2b9ff366fcba66b753815 --- /dev/null -+++ b/src/main/java/com/mojang/brigadier/exceptions/TagParseCommandSyntaxException.java -@@ -0,0 +1,13 @@ -+package com.mojang.brigadier.exceptions; ++++ b/src/main/java/io/papermc/paper/brigadier/TagParseCommandSyntaxException.java +@@ -0,0 +1,15 @@ ++package io.papermc.paper.brigadier; + +import com.mojang.brigadier.LiteralMessage; ++import com.mojang.brigadier.exceptions.CommandSyntaxException; ++import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; +import net.minecraft.network.chat.Component; + +public final class TagParseCommandSyntaxException extends CommandSyntaxException { @@ -52,7 +54,7 @@ index 0000000000000000000000000000000000000000..bf248a215dc69bb303c836112309471a + } +} diff --git a/src/main/java/net/minecraft/nbt/TagParser.java b/src/main/java/net/minecraft/nbt/TagParser.java -index 5bec54239a2b185284c10d58854e5a13e33daae5..94cb73e7f60171aa57bd1dbe7e91ef4db94e70b7 100644 +index 5bec54239a2b185284c10d58854e5a13e33daae5..ef970428fe9fe36c242ce6588bb6843eb6179d59 100644 --- a/src/main/java/net/minecraft/nbt/TagParser.java +++ b/src/main/java/net/minecraft/nbt/TagParser.java @@ -48,6 +48,7 @@ public class TagParser { @@ -118,7 +120,7 @@ index 5bec54239a2b185284c10d58854e5a13e33daae5..94cb73e7f60171aa57bd1dbe7e91ef4d + private void increaseDepth() throws CommandSyntaxException { + this.depth++; + if (this.depth > 512) { -+ throw new com.mojang.brigadier.exceptions.TagParseCommandSyntaxException("NBT tag is too complex, depth > 512"); ++ throw new io.papermc.paper.brigadier.TagParseCommandSyntaxException("NBT tag is too complex, depth > 512"); + } + } } @@ -182,7 +184,7 @@ index a5e438a834826161c52ca9db57d234d9ff80a591..4766994cce060564370b0d24836a7da8 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4..87e5ee042ab2c052d25ab4c2521a68cf2e2d67b6 100644 +index 98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4..860d33ac56680babd87358b1d7d2216dac3f7865 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -777,6 +777,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -205,7 +207,7 @@ index 98496bcc7ab9adde3fdc8b2cd9eaeceee99e28b4..87e5ee042ab2c052d25ab4c2521a68cf ParseResults parseresults = this.server.getCommands().getDispatcher().parse(stringreader, this.player.createCommandSourceStack()); + // Paper start - Handle non-recoverable exceptions + if (!parseresults.getExceptions().isEmpty() -+ && parseresults.getExceptions().values().stream().anyMatch(e -> e instanceof com.mojang.brigadier.exceptions.TagParseCommandSyntaxException)) { ++ && parseresults.getExceptions().values().stream().anyMatch(e -> e instanceof io.papermc.paper.brigadier.TagParseCommandSyntaxException)) { + this.disconnect(Component.translatable("disconnect.spam"), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM); + return; + } From 45d1486fecab6f50c193bea0fcf03727832f3091 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Fri, 29 Mar 2024 10:43:36 -0700 Subject: [PATCH 16/16] build: Update paperweight to 1.5.12 and Gradle Wrapper to 8.7 (#10361) --- .../re-add-asm-dependency.patch | 29 ------------------ build.gradle.kts | 4 +-- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++------ .../server/0001-Setup-Gradle-project.patch | 10 ++---- settings.gradle.kts | 2 +- 7 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 build-data/spigot-server-patches/re-add-asm-dependency.patch diff --git a/build-data/spigot-server-patches/re-add-asm-dependency.patch b/build-data/spigot-server-patches/re-add-asm-dependency.patch deleted file mode 100644 index 6e33148caaa2..000000000000 --- a/build-data/spigot-server-patches/re-add-asm-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /dev/null 2024-01-13 10:03:30.400485704 -0800 -+++ CraftBukkit-Patches/9999-re-add-asm-dependency.patch 2024-01-13 21:41:27.650692678 -0800 -@@ -0,0 +1,26 @@ -+From e5eb4fb3bfb61dfd2dc97411cfab5fa94033b90c Mon Sep 17 00:00:00 2001 -+From: Jake Potrebic -+Date: Sat, 13 Jan 2024 21:41:02 -0800 -+Subject: [PATCH] re add asm dependency -+ -+ -+diff --git a/pom.xml b/pom.xml -+index 266853a682..d18fdadf92 100644 -+--- a/pom.xml -++++ b/pom.xml -+@@ -58,6 +58,12 @@ -+ 2.19.0 -+ compile -+ -++ -++ org.ow2.asm -++ asm -++ 9.5 -++ compile -++ -+ -+ org.ow2.asm -+ asm-commons -+-- -+2.43.0 -+ diff --git a/build.gradle.kts b/build.gradle.kts index 2e1633818c3d..77c0f153a26f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.core") version "1.5.11" + id("io.papermc.paperweight.core") version "1.5.12" } allprojects { @@ -93,8 +93,6 @@ paperweight { mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny") reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny") - spigotServerPatchPatchesDir = layout.projectDirectory.dir("build-data/spigot-server-patches") - reobfPackagesToFix.addAll( "co.aikar.timings", "com.destroystokyo.paper", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd4917707c1f8861d8cb53dd15194d4248596..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644 GIT binary patch delta 34118 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 delta 34176 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 SGW6ptSs!X7{rG*o_g?|vpSEZK diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e0930b89..b82aa23a4f05 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f135d..25da30dbdeee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 858c5fc3294b..8d4ad0ab1cc7 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -175,10 +175,10 @@ index 0000000000000000000000000000000000000000..74849d7b20e3c3831a6a6c3715a6e875 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 22a2e4d92ba6774aa27c0bd123dac912b3e1ee65..0000000000000000000000000000000000000000 +index 323892c4a4bbbb9e36a6295bb390ad82798e213c..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,614 +0,0 @@ +@@ -1,608 +0,0 @@ - - 4.0.0 @@ -241,12 +241,6 @@ index 22a2e4d92ba6774aa27c0bd123dac912b3e1ee65..00000000000000000000000000000000 - - - org.ow2.asm -- asm -- 9.5 -- compile -- -- -- org.ow2.asm - asm-commons - 9.5 - compile diff --git a/settings.gradle.kts b/settings.gradle.kts index 5dabeac5af99..706a83d5dd66 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } if (!file(".git").exists()) {