mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@fcedb49 Update spark-paper PaperMC/Paper@956b3d1 Ensure MaterialChoice materials are items (#11325) PaperMC/Paper@5625051 Prevent duplicate pickup event for piglins (#11322) PaperMC/Paper@94444ce Fix incorrect timestamp in region file header recalculation (#11318) PaperMC/Paper@5b2c43e Remove set damage lootable item function from compasses (#11317) PaperMC/Paper@5167856 Fix despawn ranges by defaulting to an ellipsoid shape (#11312) PaperMC/Paper@e2da65c Deprecate API relating to menu title changes (#11309) PaperMC/Paper@ad4c524 Properly destroy placed blocks on the end platform (#11292) PaperMC/Paper@374d9c8 Add a method to reset Lodestone compasses back to normal ones (#11308) PaperMC/Paper@dd8c70a Ensure TabCompleteEvent always has a mutable backing list. (#11302) PaperMC/Paper@a7b8d95 Add enchantment seed update API (#11282) PaperMC/Paper@789a267 Re-implement maxLeashDistance world conf and call missing event (#11301)
This commit is contained in:
@@ -1073,7 +1073,7 @@ index a715ecf4a8ac91d3e5e5c6269d89e54b2c1cd279..223c3665126c576eddb1a8f7c9f5bc60
|
||||
};
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 74c5b87a2a382e37db7e4c12470badcf9e07cf54..9911d937ddaa456157aeacfe3178ab7d10fa5a3b 100644
|
||||
index e0a461b84ac51910a1ede99d162e9674f4899b79..61f193c17d08ba5cdfb653b8f2488c8fca069854 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -889,7 +889,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -1289,7 +1289,7 @@ index 273ba284ef4f515ac7ca276264e17e04cdbe5b2e..943b4e93d1cfbb6b5d933851b2494fb6
|
||||
// Purpur start
|
||||
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 3150041b72d3a4fe01a0ca6f2ddb3003f4edfff4..f17127b92115ed08ad5936d0be10ab8dd5b9bffb 100644
|
||||
index 518968c03e4e7ae99c2e40f6164c89ad27bad697..4b4bdaf8c43e15ba953c160a003a719aaf730318 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -370,13 +370,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||
@@ -1326,7 +1326,7 @@ index 3150041b72d3a4fe01a0ca6f2ddb3003f4edfff4..f17127b92115ed08ad5936d0be10ab8d
|
||||
}
|
||||
|
||||
protected Vec3i getPickupReach() {
|
||||
@@ -953,48 +953,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||
@@ -950,48 +950,48 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
|
||||
return;
|
||||
}
|
||||
// Paper end - Allow nerfed mobs to jump and float
|
||||
|
||||
Reference in New Issue
Block a user