mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@dfc38843 deprecate bubble column methods PaperMC/Paper@480b2ed0 use more specific codecs in click event actions PaperMC/Paper@e21bf450 fix chunk-gc plugin ticket config PaperMC/Paper@32fef5d2 do the fix in Ticket record getter instead PaperMC/Paper@0d8dad65 Quick cursory update of ItemStackDataComponentTest PaperMC/Paper@0f1f084b Update ItemStackDataComponentEqualsTest PaperMC/Paper@34dfd5e8 add perm for test command, fix some tests PaperMC/Paper@740abe1a Update CraftSmithingTransformRecipe PaperMC/Paper@de93fda5 Merge branch 'update/1.21.5' of github.com:PaperMC/Paper into update/1.21.5 PaperMC/Paper@c02ad46d Update SmithingTripRecipe PaperMC/Paper@0a5ea70a Also bundle mc source change from last commit PaperMC/Paper@e7534177 Some marginal work on DataComponents PaperMC/Paper@db35db76 Implement legacy custom biome PaperMC/Paper@18b06e38 Implement plugin tickets PaperMC/Paper@c7b22702 Implement custom legacy biome PaperMC/Paper@77f07c89 Call drop events for dropping items PaperMC/Paper@eac69a96 Pray my thesis is better than this PaperMC/Paper@c5231f91 Update to 1.21.5 PaperMC/Paper@a3f71b0f update some magic values PaperMC/Paper@704cc38c Add some missing adapters PaperMC/Paper@536b9b4b fix some more tests PaperMC/Paper@985ebcfe Quick handling for ChickenVariant data component, remove dupe PaperMC/Paper@39eafa2a implement wolf sound variants PaperMC/Paper@c78f5631 make class node tests have a display name PaperMC/Paper@3be8a83c Allow picking items from inventory PaperMC/Paper@95beb8c0 register wolf sound variant
This commit is contained in:
@@ -77,7 +77,7 @@
|
||||
}
|
||||
|
||||
public boolean causeFallDamage(double fallDistance, float damageMultiplier, DamageSource damageSource) {
|
||||
@@ -1747,7 +_,7 @@
|
||||
@@ -1741,7 +_,7 @@
|
||||
return this.isInWater() || flag;
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
if (this.getVehicle() instanceof AbstractBoat abstractBoat && !abstractBoat.isUnderWater()) {
|
||||
this.wasTouchingWater = false;
|
||||
} else if (this.updateFluidHeightAndDoFluidPushing(FluidTags.WATER, 0.014)) {
|
||||
@@ -2369,6 +_,13 @@
|
||||
@@ -2363,6 +_,13 @@
|
||||
compound.putBoolean("Paper.FreezeLock", true);
|
||||
}
|
||||
// Paper end
|
||||
@@ -100,7 +100,7 @@
|
||||
return compound;
|
||||
} catch (Throwable var8) {
|
||||
CrashReport crashReport = CrashReport.forThrowable(var8, "Saving entity NBT");
|
||||
@@ -2486,6 +_,13 @@
|
||||
@@ -2480,6 +_,13 @@
|
||||
freezeLocked = compound.getBooleanOr("Paper.FreezeLock", false);
|
||||
}
|
||||
// Paper end
|
||||
@@ -114,7 +114,7 @@
|
||||
} catch (Throwable var8) {
|
||||
CrashReport crashReport = CrashReport.forThrowable(var8, "Loading entity NBT");
|
||||
CrashReportCategory crashReportCategory = crashReport.addCategory("Entity being loaded");
|
||||
@@ -2625,6 +_,7 @@
|
||||
@@ -2619,6 +_,7 @@
|
||||
if (this.isAlive() && this instanceof Leashable leashable) {
|
||||
if (leashable.getLeashHolder() == player) {
|
||||
if (!this.level().isClientSide()) {
|
||||
@@ -122,7 +122,7 @@
|
||||
// CraftBukkit start - fire PlayerUnleashEntityEvent
|
||||
// Paper start - Expand EntityUnleashEvent
|
||||
org.bukkit.event.player.PlayerUnleashEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.hasInfiniteMaterials());
|
||||
@@ -2941,15 +_,18 @@
|
||||
@@ -2935,15 +_,18 @@
|
||||
return Vec3.directionFromRotation(this.getRotationVector());
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3154,7 +_,7 @@
|
||||
@@ -3148,7 +_,7 @@
|
||||
}
|
||||
|
||||
public int getMaxAirSupply() {
|
||||
@@ -151,7 +151,7 @@
|
||||
}
|
||||
|
||||
public int getAirSupply() {
|
||||
@@ -3682,7 +_,7 @@
|
||||
@@ -3676,7 +_,7 @@
|
||||
// CraftBukkit end
|
||||
|
||||
public boolean canUsePortal(boolean allowPassengers) {
|
||||
@@ -160,7 +160,7 @@
|
||||
}
|
||||
|
||||
public boolean canTeleport(Level fromLevel, Level toLevel) {
|
||||
@@ -4217,6 +_,12 @@
|
||||
@@ -4211,6 +_,12 @@
|
||||
return Mth.lerp(partialTick, this.yRotO, this.yRot);
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> fluidTag, double motionScale) {
|
||||
if (this.touchingUnloadedChunk()) {
|
||||
return false;
|
||||
@@ -4557,7 +_,7 @@
|
||||
@@ -4551,7 +_,7 @@
|
||||
}
|
||||
|
||||
public float maxUpStep() {
|
||||
|
||||
Reference in New Issue
Block a user