Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@9a19308 Lock Frozen Ticks API (#7207)
PaperMC/Paper@a058ac0 Dolphin API (#7102)
PaperMC/Paper@f6c7d53 Add configurable stronghold seed (#7334)
PaperMC/Paper@7978121 More PotionEffectType API (#5737)
PaperMC/Paper@9490475 Add STRUCTURE_TYPE registry entry (#6400)
This commit is contained in:
BillyGalbreath
2022-01-23 18:04:09 -06:00
parent 746e8f9caf
commit cb7bcb9686
29 changed files with 98 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2536,7 +2536,7 @@ 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 eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0fab09101e 100644
index 4584dcec835f97e94dcf12788b66703075dafe45..e0c91bc518168441fffa32f4c611a74800a8d2e2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -227,7 +227,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2548,7 +2548,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
public float yRot; // Paper - private->public
@@ -348,6 +348,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -349,6 +349,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return this.originWorld;
}
// Paper end
@@ -2560,7 +2560,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
public float getBukkitYaw() {
return this.yRot;
}
@@ -371,17 +376,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -372,17 +377,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
this.isLegacyTrackingEntity = isLegacyTrackingEntity;
}
@@ -2598,7 +2598,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
for (Entity passenger : passengers) {
org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
@@ -390,6 +414,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -391,6 +415,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
range = passengerRange;
}
}
@@ -2608,7 +2608,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -3860,16 +3887,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3867,16 +3894,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
public boolean updateFluidHeightAndDoFluidPushing(Tag<Fluid> tag, double speed) {
@@ -2634,7 +2634,7 @@ index eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -3877,14 +3906,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3884,14 +3913,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 eac13465c8c1827953a8b1bb2feb4d7f92c773fb..04298bb935eacab6245afc0ae465ef0f
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -3906,9 +3982,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3913,9 +3989,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 44a32fd2c08a09af0bba01547847b8594a7cd077..eeef768b8a4235276812ac060da5505274688a57 100644
index 25338fe4cfdc683ca4c01487e166a1649c6f640b..a6681690e1e556440320c492bf2a8e617008baa1 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;