Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1d2d9566 fix(#13144): Entity pathfinding paths do not appear with 1.21.9 debug flag enabled (#13202)
PaperMC/Paper@cf02a071 Add Particle.Spell support to ParticleBuilder#color(Color, float) (#13128)
PaperMC/Paper@97452e19 Improvements for Player#openBook (#12582)
PaperMC/Paper@d16e03fb [ci/skip] Add IntelliJ tips to CONTRIBUTING.md (#13299)
This commit is contained in:
granny
2025-11-13 13:19:42 -08:00
parent 56ac4ded5a
commit d22f66f2ad
5 changed files with 18 additions and 7 deletions

View File

@@ -494,6 +494,17 @@ If you use Maven to build your plugin:
If you use Windows and don't usually build using WSL, you might not need to If you use Windows and don't usually build using WSL, you might not need to
do this. do this.
## Tips and Tricks
### IntelliJ IDEA
- Under `Settings > Appearance & Behavior > System Settings`, disable
`Sync external changes: Periodically when the IDE is inactive (experimental)`.
When disabled, the IDE will not attempt to reindex files while patches are applying
unless you interact with the IDE during the process. This avoids severe slowdowns and freezes.
- Under `Settings > Appearance & Behavior > System Settings`, you may also want to
disable `Reopen projects on startup` to avoid freeze loops.
## Frequently Asked Questions ## Frequently Asked Questions
### My commit doesn't need a build, what do I do? ### My commit doesn't need a build, what do I do?

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.10-R0.1-SNAPSHOT version = 1.21.10-R0.1-SNAPSHOT
mcVersion = 1.21.10 mcVersion = 1.21.10
paperCommit = 1f31ee5ebe45d97a596a4429d9871e3f8910cd28 paperCommit = d16e03fbaa08ca316ef35384f6a6077cde0eafe5
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4003,4 +_,123 @@ @@ -4004,4 +_,123 @@
*/ */
@ApiStatus.Experimental @ApiStatus.Experimental
PlayerGameConnection getConnection(); PlayerGameConnection getConnection();

View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ecb01b035d81a42911db1c8364e23ccba4a8b790..56bbaab57432a78e85bc0013cd7f991f662f0cd2 100644 index 29c08d097b487b177426ec2ea78f8fe79d987bdc..b615c03d73071c923e0a3d1123810e110419318b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1382,6 +1382,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa @@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
// Minecraft does not currently support teleporting players between worlds with passengers. // Minecraft does not currently support teleporting players between worlds with passengers.
// It causes them to be dismounted, and causes weird behavior. // It causes them to be dismounted, and causes weird behavior.
if (location.getWorld() != this.getWorld() && !this.getHandle().passengers.isEmpty()) { if (location.getWorld() != this.getWorld() && !this.getHandle().passengers.isEmpty()) {

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -571,10 +_,15 @@ @@ -579,10 +_,15 @@
@Override @Override
public void setPlayerListName(String name) { public void setPlayerListName(String name) {
@@ -17,7 +17,7 @@
if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
for (ServerPlayer player : this.server.getHandle().players) { for (ServerPlayer player : this.server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) { if (player.getBukkitEntity().canSee(this)) {
@@ -977,6 +_,80 @@ @@ -985,6 +_,80 @@
} }
} }
@@ -98,7 +98,7 @@
@Override @Override
public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) { public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) {
Preconditions.checkArgument(source != null, "source must not be null"); Preconditions.checkArgument(source != null, "source must not be null");
@@ -2475,6 +_,28 @@ @@ -2483,6 +_,28 @@
public float getWalkSpeed() { public float getWalkSpeed() {
return this.getHandle().getAbilities().walkingSpeed * 2f; return this.getHandle().getAbilities().walkingSpeed * 2f;
} }