Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f613437 Fix CraftPlayerProfile#setId regression (#9822)
PaperMC/Paper@3e9d2ac Don't call options events on login (#9834)
PaperMC/Paper@e4d184f Replace bukkit Consumers with java consumers (#9836)
PaperMC/Paper@3e1c5e3 Add BlockData setter for FallingBlock (#9829)
PaperMC/Paper@852c1c2 Add additional tags to ItemMeta obfuscation filtering (#9665)
This commit is contained in:
granny
2023-10-14 18:33:56 -07:00
parent ad03187fab
commit ff126d3257
12 changed files with 35 additions and 35 deletions

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2
paperCommit = 2f5bb7e30630532328ed1b051e8ef1912eae7cf1
paperCommit = 852c1c236d080d9fd907a5f4fd3e850437996aa2
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index da524a71af74b02515b037f7fe09ba6988e2c8bf..b71a5a3f9a97e348f073635eb35f7a5df52e1814 100644
index 8d861f5522a33669f67b3e41dfbc5234637114b4..d12443e6e1f71354dcfab9cf2f166a1097b589b5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4008,6 +4008,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4010,6 +4010,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();

View File

@@ -179,10 +179,10 @@ index 3bc9fa8b68b284516ddbf0ace0c1dc52768307cb..aaef58468a3c31f35e5067ed4263e9dd
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index b71a5a3f9a97e348f073635eb35f7a5df52e1814..3679c3b8d31ab8de08ecabd56bf92ffc062f971c 100644
index d12443e6e1f71354dcfab9cf2f166a1097b589b5..9a1526d3da2052815404328c2022119b98db7aa4 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4016,6 +4016,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4018,6 +4018,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The local difficulty
*/
public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,7 +260,7 @@ index b71a5a3f9a97e348f073635eb35f7a5df52e1814..3679c3b8d31ab8de08ecabd56bf92ffc
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 53f509afb6bd7e8afe2d25ec6de23ece8d1c2c18..460b8d831049e1bff94b87eaeeabb38e2cc3462e 100644
index c2ab25febe558b9653cd740c477dfd7ffd9b0318..b72415a388862736af005bb2bf8d283bacfb90d9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3305,5 +3305,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

View File

@@ -46,7 +46,7 @@ index 17610196db7a1c6feb2cf74a02479a8691aa323f..ffa9e5672c9c416fbf0a7412c6cdaedc
final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 337084b28d282a5f6b03244ad14d4028477d735d..bb481a07a34c4f8d9dfab2f354272ca0a733ea9a 100644
index 75faac7c8009672c733033c5aabb4e1974ce5790..3f5d87ccdee1309ae8240a3d181e268d8c022f56 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -756,6 +756,15 @@ public class ServerPlayer extends Player {
@@ -191,7 +191,7 @@ index 1bb8b6e91c44cd13411d96d749fa64835c75a267..75c278b67ad2b78766efd8f89c4c2ca7
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 77a1c7dfbaccc2e74da5c78ce4dfcd1717a7ac65..4f6ec3e2dcdb4a316cf58a9044a8cacdd982bba3 100644
index b95f88d5e5b4785ee063695fd81935636a0588d1..6a09fe2e6557800bed82a19c0f6f8bce688c510c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -233,7 +233,7 @@ index 77a1c7dfbaccc2e74da5c78ce4dfcd1717a7ac65..4f6ec3e2dcdb4a316cf58a9044a8cacd
Vec3 vec3d = this.getDeltaMovement();
// Paper start
long time = System.nanoTime();
@@ -3465,8 +3466,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3472,8 +3473,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.pushEntities();
this.level().getProfiler().pop();
// Paper start
@@ -246,7 +246,7 @@ index 77a1c7dfbaccc2e74da5c78ce4dfcd1717a7ac65..4f6ec3e2dcdb4a316cf58a9044a8cacd
Location from = new Location(this.level().getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
Location to = new Location (this.level().getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
@@ -3476,6 +3479,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3483,6 +3486,21 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
}
}

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bb481a07a34c4f8d9dfab2f354272ca0a733ea9a..1520defef5010fb1cad0cb919497ad9ebc772dc1 100644
index 3f5d87ccdee1309ae8240a3d181e268d8c022f56..9918f6ac1066ccadd3eb2635450faaf5a4350523 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2129,8 +2129,68 @@ public class ServerPlayer extends Player {
@@ -2134,8 +2134,68 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cb6bcd006ef482087a336747836889bb3afcb53e..1c43db48baf33b96be7dd027f3cbaedf205b5101 100644
index 48c5c63469a81ba3d671f8ea9efd815b6ebb7031..395cfab75f313be3921952bc570fd53194ad37d6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3526,7 +3526,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3533,7 +3533,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
int j = i / 10;
if (j % 2 == 0) {
@@ -54,7 +54,7 @@ index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecb
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index d375703e0ad4cc2b82d6693e15800539e0c7c9f1..c9d1e2af3afd7a9320b589ede8ff29ffbaf9297d 100644
index 25be1927304e497a6ebf9d9ec09525a5418095db..6e6f60554b36117a833949ef2f9a4b68f6518a1d 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -618,7 +618,7 @@ public final class ItemStack {

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 97bba09ee186963f44380f2fbffa10a0b33d513e..97fcc122278c5b0f88e7f18eeb601a75753ae209 100644
index 85383b6a9d16b7cf7e928c4d9aaf7af932540091..8b05588b480af39d25bfcb84a5241e9e055c81f8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2739,4 +2739,26 @@ public class ServerPlayer extends Player {
@@ -2744,4 +2744,26 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end
@@ -36,7 +36,7 @@ index 97bba09ee186963f44380f2fbffa10a0b33d513e..97fcc122278c5b0f88e7f18eeb601a75
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index da41e778ac201b4e0f01adc4772f85a60c8f8d53..2bed5e81cc462cafaea64324a7816604a30a07dd 100644
index 395cfab75f313be3921952bc570fd53194ad37d6..47ae4785f08e7d0a51e2ddd01f8cc06aadb46cb0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -428,6 +428,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

View File

@@ -41,7 +41,7 @@ index aa85cb619315b327469e6aea92876f47235ce725..7b929d080e5fdd3a535a22a5f9e35955
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index dd83aa83e8d4da4d16e9731f8527cd0f470848e0..9d6733c426c823cfac4da542fd83c5e6832312e1 100644
index 48337c143a825c2107b9f1c4b086050ad02e553a..baf508a942b02d94dfe2c1fffc3cde930a492367 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index dd83aa83e8d4da4d16e9731f8527cd0f470848e0..9d6733c426c823cfac4da542fd83c5e6
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2769,5 +2772,13 @@ public class ServerPlayer extends Player {
@@ -2774,5 +2777,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
}
}

View File

@@ -32,7 +32,7 @@ index dcfa461492623e70b65dfb090c8a078fe88613cd..70625c6337d3a68c27c046115186fbf7
return this.hardCollides;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2e89a05402dd895eee4a27a345318baeabbd1f96..7e4d059882a804edc7d6536d4ee409c1822c5b2a 100644
index f2c3c587fdb7fbb42c91437226e6228df5a03c51..711fc212034601008449b9aa9fa83aee363ebe55 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index 2e89a05402dd895eee4a27a345318baeabbd1f96..7e4d059882a804edc7d6536d4ee409c1
}
// CraftBukkit start
@@ -3544,6 +3551,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3551,6 +3558,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}
@@ -277,7 +277,7 @@ index 030b81dd8c52ddb300e73d792f9c4cea4e8a8d46..1d4a292a37069408420ca90b1c278422
// Paper end
private static enum AttackPhase {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index cb4a50f0259465eff425aac468cb409976b4de13..143ac5fac02a29516d03b69008b1345555857640 100644
index 63c0f86469182de482b04a27741e4b6fe29f0e79..15baaf9c358019b1ce2152086e8d16591eec7dbb 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -96,11 +96,12 @@ public class Zombie extends Monster {
@@ -353,7 +353,7 @@ index cb4a50f0259465eff425aac468cb409976b4de13..143ac5fac02a29516d03b69008b13455
// 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 2ed4e15e6fcd0d00556f772f6fa48e5817a2de2d..431e3cedde33b33202be1d44bf066323997f21f8 100644
index d1a550aa5905d26e5b0f534338b3f30f1f2db67c..eb409ecf5bf06692038e9fe84af986092a7d7837 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -223,6 +223,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -369,7 +369,7 @@ index 2ed4e15e6fcd0d00556f772f6fa48e5817a2de2d..431e3cedde33b33202be1d44bf066323
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1001beea3538a9723074421047dc3fbecf063d02..a6934034c9fc8e3f04365d7595fccbe68fc093b6 100644
index 07cbcb7f5a77b75ba10ccb470502c73fab17784e..42b336a96e5c786b95356200da7d02bfd8b584dc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1116,5 +1116,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

View File

@@ -17,7 +17,7 @@ index e254f7c498c5a1608afe130b2dd4d3d037069f25..af712f089e7919fa0bd3946866fd3486
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 97317911fac30d1f762291d0d615e004384a9b6f..e7c90ce23a68cbf4b44a750f2dafc06c19e5fb06 100644
index 4cc1604114ce283a70fb8faf89ac2b3979b06b52..f00c8b834db7ff9c92d878560d83db91b76c82fe 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -276,6 +276,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 97317911fac30d1f762291d0d615e004384a9b6f..e7c90ce23a68cbf4b44a750f2dafc06c
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2794,5 +2797,13 @@ public class ServerPlayer extends Player {
@@ -2799,5 +2802,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}

View File

@@ -770,7 +770,7 @@ index b1f5ccd309f84f7b53d16ad6241bb4cb1bdd0726..db3c7b914a301005ba7fa92c7c042777
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index aee4dfff6e5d3c33b2c8faa4d3ee15da3ea3e4ef..12ed724a4d8824a388ef74ac90313d13fda5352c 100644
index 6a97eca066c6957eefb15e8f23eb29b1781cf1a9..41bd87096ab195c56695c5c5e46dc3c75e5a9078 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1237,7 +1237,7 @@ public class ServerPlayer extends Player {
@@ -1155,7 +1155,7 @@ index 28cac00d496cc6e37648dbe96ba4aea2b834cedd..6e0331818ef68fa355e3c27dc3e362b8
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c610016ae7d 100644
index 3380ffce121b3e4d503021c7f8a47501d3f50811..78841e0280680c720cd05ac75cbe6f70a330cad0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -411,7 +411,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1199,7 +1199,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3434,19 +3434,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3441,19 +3441,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1224,7 +1224,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3473,8 +3473,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3480,8 +3480,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1235,7 +1235,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3501,8 +3501,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3508,8 +3508,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1246,7 +1246,7 @@ index 3788737aceca571827c958623c1b241e24917f6e..c132ab8142bf55f2ab00617b7ba90c61
if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3519,15 +3519,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3526,15 +3526,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}

View File

@@ -18,7 +18,7 @@ index 9caab6541a224dc8f729a7d720eccda7bd83ed53..2fd376789bb24b14101e289733631a9a
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 12ed724a4d8824a388ef74ac90313d13fda5352c..8d6adc26ee59c1e7e9403731032f5dc11be80b9d 100644
index 41bd87096ab195c56695c5c5e46dc3c75e5a9078..6b5bcc87e96619877737fc8200075bdb99d59230 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 12ed724a4d8824a388ef74ac90313d13fda5352c..8d6adc26ee59c1e7e9403731032f5dc1
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2806,5 +2809,13 @@ public class ServerPlayer extends Player {
@@ -2811,5 +2814,13 @@ public class ServerPlayer extends Player {
public void compassBar(boolean compassBar) {
this.compassBar = compassBar;
}