Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2412,7 +2412,7 @@ index a2abb8aa1a257ccd2b5dbddc037fffc6eb600758..8cdacd7ed9a26e6757eeff89545fde21
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 926d0a80cbb55184955ac6720948d2e86683cc57..889a4804eaa128e2f79a4ea48b8aa796336576d1 100644
index 5c9310fe424943a7256f6f77c414147384bad0aa..2cb12547c778fe439536e2e2aa479d4a25ab4a6e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1110,6 +1110,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2536,10 +2536,10 @@ index 7437f01ca8f416e2c9150250e324af4725a4efb6..7ac51dbfce18a2bc52faa7a915abeccc
int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b419ac57133 100644
index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0fab09101e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -222,7 +222,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -227,7 +227,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
public double yo;
public double zo;
private Vec3 position;
@@ -2548,7 +2548,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
public float yRot; // Paper - private->public
@@ -342,6 +342,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -348,6 +348,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return this.originWorld;
}
// Paper end
@@ -2560,7 +2560,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
public float getBukkitYaw() {
return this.yRot;
}
@@ -365,17 +370,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -371,17 +376,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
this.isLegacyTrackingEntity = isLegacyTrackingEntity;
}
@@ -2598,7 +2598,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
for (Entity passenger : passengers) {
org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
@@ -384,6 +408,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -390,6 +414,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
range = passengerRange;
}
}
@@ -2608,7 +2608,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -3845,16 +3872,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3860,16 +3887,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double speed) {
@@ -2634,7 +2634,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -3862,14 +3891,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3877,14 +3906,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2702,7 +2702,7 @@ index 8ca6388ddd834c4f0e94450c8a6ce6b5e73a5f60..5ded03b80f71111e8480036ae2787b41
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -3891,9 +3967,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3906,9 +3982,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
// CraftBukkit end
}
}
@@ -2728,7 +2728,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..9bc568a2b0df13f55ee8670839b9e6a6
public final String id;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 572f9ca81b78c6229725f6693940ac0a70ecdfd5..d4da096f22bd3c118304fb00c7b9763562b9c889 100644
index 44a32fd2c08a09af0bba01547847b8594a7cd077..eeef768b8a4235276812ac060da5505274688a57 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -139,7 +139,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2739,7 +2739,7 @@ index 572f9ca81b78c6229725f6693940ac0a70ecdfd5..d4da096f22bd3c118304fb00c7b97635
public abstract class LivingEntity extends Entity {
@@ -394,8 +393,7 @@ public abstract class LivingEntity extends Entity {
@@ -393,8 +392,7 @@ public abstract class LivingEntity extends Entity {
if (this.isAlive()) {
boolean flag = this instanceof net.minecraft.world.entity.player.Player;
@@ -2749,7 +2749,7 @@ index 572f9ca81b78c6229725f6693940ac0a70ecdfd5..d4da096f22bd3c118304fb00c7b97635
this.hurt(DamageSource.IN_WALL, 1.0F);
} else if (flag && !this.level.getWorldBorder().isWithinBounds(this.getBoundingBox())) {
double d0 = this.level.getWorldBorder().getDistanceToBorder(this) + this.level.getWorldBorder().getDamageSafeZone();
@@ -1288,6 +1286,15 @@ public abstract class LivingEntity extends Entity {
@@ -1287,6 +1285,15 @@ public abstract class LivingEntity extends Entity {
return this.getHealth() <= 0.0F;
}
@@ -2765,7 +2765,7 @@ index 572f9ca81b78c6229725f6693940ac0a70ecdfd5..d4da096f22bd3c118304fb00c7b97635
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1840,6 +1847,20 @@ public abstract class LivingEntity extends Entity {
@@ -1839,6 +1846,20 @@ public abstract class LivingEntity extends Entity {
return this.lastClimbablePos;
}
@@ -2786,7 +2786,7 @@ index 572f9ca81b78c6229725f6693940ac0a70ecdfd5..d4da096f22bd3c118304fb00c7b97635
public boolean onClimbable() {
if (this.isSpectator()) {
return false;
@@ -3537,7 +3558,10 @@ public abstract class LivingEntity extends Entity {
@@ -3536,7 +3557,10 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2986,10 +2986,10 @@ index 29dfbcecfbb2560e6ecde997abd5224a16c08c94..a76b754305036bf9c6387e27b86ec155
@Override
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 86acf89ce875e215da8469947b382f70e42314b0..0fe2d6190ebba24713a3da7ef5367ecb86814a66 100644
index a3ad957a9131168656b8e30c82d762c77e96ae6e..c296862063d2dcaf5e2d03d316c49ae03ab7d625 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -276,9 +276,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -282,9 +282,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
return true;
}
@@ -3018,7 +3018,7 @@ index cc5687f43f8ac99995667fdc53c5c0586f70f367..d5cd18c478bedaeed83de31d442d1a5b
this.level.getProfiler().pop();
this.level.getProfiler().push("goatActivityUpdate");
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index f09db211f6f789ced85f7bf716428cd04bb41378..3ad87457cc1279540b5b633216aa0161e6e9b1b2 100644
index 5170a3d87fa95eace2ec5e56ad4ebc4b25f9297c..7889c9832c6a1ac2afebe4e1030495b3ea52fc2b 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -242,10 +242,16 @@ public class ItemEntity extends Entity {
@@ -4211,7 +4211,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 54a55cc05776af8de63b492bbda58182bb4c3726..8d3147b48eff5418f452eb1449639316399942ee 100644
index 8bd8b85445b2b0b6517590baef33bb4234bb2a38..59a6cb575e40465275184cb816c862c79995c729 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;