Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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

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;