Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27: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@0193a9d Add EntityPortalReadyEvent (#5619)
PaperMC/Paper@4952c04 Don't use level random in entity constructors (#8122)
PaperMC/Paper@1a8bea7 Fix wrong world being passed into portal event (#8174)
This commit is contained in:
BillyGalbreath
2022-07-22 20:52:13 -05:00
parent 697c83e324
commit a60a01188e
11 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = 5deafd1969b3c521af9cabb46822ecb01e6ce498
paperCommit = 1a8bea734a28d5cf81e2e1db130004e8d1d283bc
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -3178,7 +3178,7 @@ index 1a918eabbaaed26d9bdf5c01e0488b5a117ba516..32a39a150a3d2bbae95a726901f3f463
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 f342043f4a8aef7e757571ead0e0218fe7e5ee58..0960025c64fe2e8c055fcbf6e695ff90c1f41cd9 100644
index 935c482be4bf3767e197a576d0e38eac51115dd4..1581215f7e8348e40d248c8e3d5ef43143e69579 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1149,6 +1149,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -3302,7 +3302,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
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 19a64b582bc042e426220e080d9c21b3a82cf3f7..beab9f74ba3c3ef294485ee74daf165475d29566 100644
index 76b9beb0d8ebeee0f603d2740ba71beabbf19e25..1ea1b51ceb0f90d30ca92a1b790bb7674ccef4b4 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 {
@@ -3387,7 +3387,7 @@ index 19a64b582bc042e426220e080d9c21b3a82cf3f7..beab9f74ba3c3ef294485ee74daf1654
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;
@@ -3986,16 +4019,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3994,16 +4027,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -3413,7 +3413,7 @@ index 19a64b582bc042e426220e080d9c21b3a82cf3f7..beab9f74ba3c3ef294485ee74daf1654
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4003,14 +4038,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4011,14 +4046,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -3481,7 +3481,7 @@ index 19a64b582bc042e426220e080d9c21b3a82cf3f7..beab9f74ba3c3ef294485ee74daf1654
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4032,9 +4114,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4040,9 +4122,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}
@@ -4246,7 +4246,7 @@ index 50d4595b81f24949011c7565c5e3fc8c26c86019..234ad92d666775dcf5a29a60551b17cb
@Override
protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index e5de2c1d11e5de88420caba35bf75c8bbd799db5..23b8c9838b860b132ea043b7507ebc2220a49640 100644
index a9cdf9034ad269f7a71358443acc053288cfbe6d..dbeb70913d3933164e997ce5d662b4890ffe4f36 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -1071,7 +1071,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -4334,10 +4334,10 @@ index 31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5..362f952888f63a453a4352a9f1dc7df7
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 08f15739dd7e2ab80718ab8d983b483a46309deb..64c8eefa0302b04b416cd4912c01c50feddf1301 100644
index c58c296bbb0fbd1930dba38bcab7ec3103917ba5..68c88e91ceb1fb19d2b3c168e56d7a4314232d64 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -249,10 +249,16 @@ public class ItemEntity extends Entity {
@@ -254,10 +254,16 @@ public class ItemEntity extends Entity {
if (entityitem.isMergable()) {
// Paper Start - Fix items merging through walls
if (this.level.paperConfig().fixes.fixItemsMergingThroughWalls) {

4
patches/server/0007-Component-related-conveniences.patch
View File

@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index beab9f74ba3c3ef294485ee74daf165475d29566..254ec6a7a742003df0e9ac1e92fe1930d4bf5a3d 100644
index 1ea1b51ceb0f90d30ca92a1b790bb7674ccef4b4..ecc0603742c67ef4e3bf8f604ebd06c2da5db029 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3778,6 +3778,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3786,6 +3786,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}

6
patches/server/0008-Ridables.patch
View File

@@ -79,7 +79,7 @@ index 19cbccc56a526d597bd9124d38c84a85f6ad237d..472a5dac726c77caa34b2f1343495cae
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 254ec6a7a742003df0e9ac1e92fe1930d4bf5a3d..b294ebd7f7a327756f2925b8418d755d7db4aa0d 100644
index ecc0603742c67ef4e3bf8f604ebd06c2da5db029..b6222cab36cdd94a3b31254f94e18d477078dbfc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -119,7 +119,7 @@ index 254ec6a7a742003df0e9ac1e92fe1930d4bf5a3d..b294ebd7f7a327756f2925b8418d755d
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4525,4 +4539,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4533,4 +4547,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -702,7 +702,7 @@ index 1f85f34c1e50f34fb270d2fac7d307c82a550bfa..324f52edd95b5f9a498e46def8c14435
double d = this.wantedX - this.fish.getX();
double e = this.wantedY - this.fish.getY();
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 23b8c9838b860b132ea043b7507ebc2220a49640..15c8fcb3df7ae30fecdfc367904a6fe12a7143ad 100644
index dbeb70913d3933164e997ce5d662b4890ffe4f36..cf7036e014097183c697b06ea5865a361221bd6a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -43,6 +43,7 @@ import net.minecraft.world.entity.EntityType;

4
patches/server/0063-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 28fa14e0cc2a0a93782bd0a8063553ff2d55a2e7..8ceab2668625c34c790fd21414b98bb6489b0ec3 100644
index c1e8dd926e9d2612f54c6afdaaa1c295da61f13d..f5ec7124e31b2cd8e810033521d2b59329f19bda 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4580,5 +4580,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4588,5 +4588,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean processClick(InteractionHand hand) {
return false;
}

6
patches/server/0069-Item-entity-immunities.patch
View File

@@ -18,7 +18,7 @@ index 871bce7f5acc1b9a058496f41d962ec2e724f620..9bfd1cb300fe7f76e9a36167390ab1c2
public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
this.trackedPlayers = trackedPlayers;
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 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f85544f47 100644
index 68c88e91ceb1fb19d2b3c168e56d7a4314232d64..8d38eac6316dedc94dc257e6dabfd704c0311caa 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -55,6 +55,12 @@ public class ItemEntity extends Entity {
@@ -34,7 +34,7 @@ index 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f
public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
super(type, world);
@@ -334,6 +340,15 @@ public class ItemEntity extends Entity {
@@ -339,6 +345,15 @@ public class ItemEntity extends Entity {
return false;
} else if (!this.getItem().getItem().canBeHurtBy(source)) {
return false;
@@ -50,7 +50,7 @@ index 64c8eefa0302b04b416cd4912c01c50feddf1301..99176a781a5e375c71197546222e2b6f
} else if (this.level.isClientSide) {
return true;
} else {
@@ -519,6 +534,12 @@ public class ItemEntity extends Entity {
@@ -524,6 +539,12 @@ public class ItemEntity extends Entity {
this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper

4
patches/server/0093-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8ceab2668625c34c790fd21414b98bb6489b0ec3..5d4049c58135893a65eb167f12afe0238bf5cbeb 100644
index f5ec7124e31b2cd8e810033521d2b59329f19bda..897466a7cef632ed569c351e5f4b5a0cfc80b2a3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4047,6 +4047,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4055,6 +4055,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.yRotO = this.getYRot();
}

4
patches/server/0095-Entities-can-use-portals-configuration.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5d4049c58135893a65eb167f12afe0238bf5cbeb..63887de35be7b1b9076bc509b92af0b860886310 100644
index 897466a7cef632ed569c351e5f4b5a0cfc80b2a3..e9285f173cb87538af52fc2a3860a2fbc0e6cf65 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2882,7 +2882,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index 5d4049c58135893a65eb167f12afe0238bf5cbeb..63887de35be7b1b9076bc509b92af0b8
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3546,7 +3546,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3554,7 +3554,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {

4
patches/server/0157-Drowning-Settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index aa477068e28a4070a26aa08e09d614bbf6fd01ab..acff59500c7ea17598b79e2702d7dea9e5f7fc76 100644
index 3c3b05bf36922f20c6d779019594e74fd55ae759..979e81017d3bd0e0309e1fef6b62e3524f536a12 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3110,7 +3110,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3118,7 +3118,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public int getMaxAirSupply() {

6
patches/server/0185-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ddf1fc47c3d01ec589548081ca9f01f8d6ccd642..2464e334de7e7f2d09e41b6b457a731239505db8 100644
index 979e81017d3bd0e0309e1fef6b62e3524f536a12..4b61032c838b4ada71e097efcc8bf4de311d7244 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4593,5 +4593,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4601,5 +4601,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}
@@ -351,7 +351,7 @@ index f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82
// 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 2890ca4d1886cf1e259fd7e7e8bab7ca33036e53..df3ea1aa8c4cfc9ed575e264d4eb851ae9f5b615 100644
index 3c3c9578f511987f8c237306647d04e8b57099e1..061d24461782e2ab76c3406f77a33f9f508f02cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

4
patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d896493356fdb59607ed193d87c55cfa2ee51b2c..db6a37a87823a3f305249c0fb7c9d90f669c5124 100644
index 4b61032c838b4ada71e097efcc8bf4de311d7244..08876bb399b166abbf9cd89a7b92a289d011455e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2930,7 +2930,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2938,7 +2938,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();