Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
PaperMC/Paper@2eda177 Expand PlayerItemMendEvent (#7382)
PaperMC/Paper@bacbf86 Fixes and additions to projectile API (#9237)
PaperMC/Paper@8a18fc5 [ci skip] add 'needs triage' label to invalid on issue close (#9252)
PaperMC/Paper@d8d3bd7 [ci skip] Add missing deprecations for legacy MaterialData api (#9253)
This commit is contained in:
granny
2023-06-04 00:18:33 -07:00
parent d6cfa8f939
commit 6d7bb23341
37 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..b41b186397d013c19436c345be98b785d4bd0295 100644
index 4f2fa65ade89c5703451dad4f80eeef162b277d1..3ee1160c796cc86db9bc9438055b307239e9a8f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -1875,7 +1875,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
int LARGE_MAX_STACK_SIZE = 64;
int DEFAULT_DISTANCE_LIMIT = 8;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb0c8d521b 100644
index 280ee1838106201f5e3ba7753caced6d030f7e55..b4ab2cfb7a5fa0d2efd1a759d754d5203aaac077 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1887,7 +1887,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
private float yRot;
@@ -416,6 +416,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -417,6 +417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return this.originWorld;
}
// Paper end
@@ -1900,7 +1900,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
public float getBukkitYaw() {
return this.yRot;
}
@@ -490,17 +496,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -491,17 +497,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.isLegacyTrackingEntity = isLegacyTrackingEntity;
}
@@ -1938,7 +1938,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
for (Entity passenger : passengers) {
org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
@@ -509,6 +534,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -510,6 +535,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
range = passengerRange;
}
}
@@ -1948,7 +1948,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -790,6 +818,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -791,6 +819,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
public void baseTick() {
@@ -1961,7 +1961,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
this.level.getProfiler().push("entityBaseTick");
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
@@ -4163,16 +4197,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4164,16 +4198,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -1987,7 +1987,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4180,14 +4216,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4181,14 +4217,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2055,7 +2055,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4209,9 +4292,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4210,9 +4293,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}
@@ -2578,7 +2578,7 @@ index 27c028ab6b1edb6e413af3bbaa27bf30f2d85540..302ca7391109c10e81a7745504b3c530
return false;
}
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 8b2a3a8482018b7db7de81bc295862f783e17ce5..e6f87e1e3c99195ed11c81162cb54e7f5750c4ba 100644
index a211ca048dddc75afce1f83ee1700bad66e457fc..85260fd93ca8d5ffd0ba7a98f1d47093d58f0f87 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -44,6 +44,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -3431,10 +3431,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 67dbfa6b384af45837d3aa29e249fd4bf92ee8fb..f025905a7afae894401638a8842a4a44fa41d1ef 100644
index 894c0d5bfa001def4374b657e3eb8f15a0caa1e9..a49520fbb3cbce866338c964dd0aadbd113bf411 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -3443,7 +3443,7 @@ index 67dbfa6b384af45837d3aa29e249fd4bf92ee8fb..f025905a7afae894401638a8842a4a44
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1040,6 +1040,11 @@ public final class CraftServer implements Server {
@@ -1042,6 +1042,11 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));