mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-04 15:31:43 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6cfa2f7 [ci skip] Add missing nullability annotation to sendEquipmentChange method (#12112) PaperMC/Paper@9b9de82 Update Alternate Current patch to v1.9.1 (#12115) PaperMC/Paper@c62252e Add lore content guard (#12116) PaperMC/Paper@4041678 [ci-skip] Mention missing World#regenerateChunk implementation in jd (#12109) PaperMC/Paper@a6e82d9 [ci skip] Clarify getChunkAtAsyncUrgently javadocs (#12125) PaperMC/Paper@cb25c0c [ci skip] Fix annotation fields used in NMS getBukkitEntity (#12120) PaperMC/Paper@0070126 [ci skip] improvement example in javadoc for DatapackRegistrar (#12122) PaperMC/Paper@608f004 add method on ItemStack to edit pdc (#12022) PaperMC/Paper@7bee997 Cleanup damage source a bit (#12106) PaperMC/Paper@b9023b5 Add EntityAttemptSmashAttackEvent (#12113) PaperMC/Paper@a3781ff Separate tick count to ensure vanilla parity (#12077) PaperMC/Paper@2a4a115 Add EntityEquipmentChangedEvent (#12011) PaperMC/Paper@06f96dd Improvement in /plugins command (#12121) PaperMC/Paper@28d07dc use correct spigot plugin count PaperMC/Paper@60394c5 Fix PlayerReadyArrowEvent cancellation desync (#12111) PaperMC/Paper@b27e11c Fix bad world to chunk coordinate example in javadocs (#12131) PaperMC/Paper@88cdd22 Fixup luck and random implementation in CB loot-tables (#11926) PaperMC/Paper@84609dc Don't auto-create any brig redirects (#11954) PaperMC/Paper@8eb8e44 Allow For Default Titles in InventoryView Builders (#12013)
This commit is contained in:
@@ -51,10 +51,10 @@ index 8f12a4df5d63ecd11e6e615d910b6e3f6dde5f3c..56beffa0c5cdb0d6a4836a0ee496bd63
|
||||
public static <T> TicketType<T> create(String name, Comparator<T> comparator) {
|
||||
return new TicketType<>(name, comparator, 0L);
|
||||
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||
index d0107d42212ddff92b5637205417e98ac76dfd69..2208f8c2176451eb65eeba05d47703f58e5d3e29 100644
|
||||
index 789a64f13185b8d761e290e931ed31f8c04c6255..9bdf3f54198c345e2091835af56b730d6aa4a7ec 100644
|
||||
--- a/net/minecraft/world/entity/Entity.java
|
||||
+++ b/net/minecraft/world/entity/Entity.java
|
||||
@@ -526,6 +526,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -527,6 +527,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
public boolean isPrimedTNT;
|
||||
public boolean isFallingBlock;
|
||||
// Sakura end - client visibility settings
|
||||
@@ -75,7 +75,7 @@ index d0107d42212ddff92b5637205417e98ac76dfd69..2208f8c2176451eb65eeba05d47703f5
|
||||
|
||||
public Entity(EntityType<?> entityType, Level level) {
|
||||
this.type = entityType;
|
||||
@@ -1465,7 +1479,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -1466,7 +1480,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
|
||||
ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.getCollisionsForBlocksOrWorldBorder(
|
||||
this.level, (Entity)(Object)this, initialCollisionBox, potentialCollisionsVoxel, potentialCollisionsBB,
|
||||
@@ -84,7 +84,7 @@ index d0107d42212ddff92b5637205417e98ac76dfd69..2208f8c2176451eb65eeba05d47703f5
|
||||
);
|
||||
potentialCollisionsBB.addAll(entityAABBs);
|
||||
final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
|
||||
@@ -4957,13 +4971,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -4958,13 +4972,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@Override
|
||||
public boolean shouldBeSaved() {
|
||||
return (this.removalReason == null || this.removalReason.shouldSave())
|
||||
|
||||
Reference in New Issue
Block a user