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@c389b1c Fix configs that relied on outdated min/max y levels (#6986)
PaperMC/Paper@57555b8 Add missing structure set seed configs (#8030)
This commit is contained in:
BillyGalbreath
2022-10-09 23:55:46 -05:00
parent c577b117e7
commit 38313f701e
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ index bfaa37739230107b73f81e227660e950d81d50a0..37f7e6d4ab2c5a043b122b34a4a0e574
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 6a106250f98edd68908e6e9703cddbf5edbe69d7..56417ab6da0f9e3d11e9935c954116d9b33844e4 100644
index 9ea08fc57efd9f593798a7c5feffaf9663ff76ad..493b8f4dba23f995235c6e6f433a25ff84a833cb 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 {
@@ -91,7 +91,7 @@ index 6a106250f98edd68908e6e9703cddbf5edbe69d7..56417ab6da0f9e3d11e9935c954116d9
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -2783,6 +2783,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2782,6 +2782,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.passengers = ImmutableList.copyOf(list);
}
@@ -104,7 +104,7 @@ index 6a106250f98edd68908e6e9703cddbf5edbe69d7..56417ab6da0f9e3d11e9935c954116d9
}
return true; // CraftBukkit
}
@@ -2823,6 +2829,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2822,6 +2828,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Spigot end
@@ -119,7 +119,7 @@ index 6a106250f98edd68908e6e9703cddbf5edbe69d7..56417ab6da0f9e3d11e9935c954116d9
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4569,4 +4583,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4568,4 +4582,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end