mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 10:59:16 +00:00
1c7d3edced
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1595e4a Make watchdog thread extend TickThread again PaperMC/Paper@34a2917 Add default canUse and permission methods to BasicCommand (#11047) PaperMC/Paper@99ae7bb Don't require author and title to be set on signed book meta (#11068) PaperMC/Paper@9fd5b3c Add AttributeModifier constructor without EquipmentSlotGroup (#11079) PaperMC/Paper@8b35adc Fix HelpCommand searching (#11066) PaperMC/Paper@b4f04ff Add Plugin#getDataPath (#11080) PaperMC/Paper@05e5865 Add ItemType#getItemRarity (#11049) PaperMC/Paper@aa929d6 Call PlayerLaunchProjectileEvent for wind charge (#10911) PaperMC/Paper@8b23018 Avoid collision shapes outside world border in findFreePosition PaperMC/Paper@3b45454 Port random ticking optimisation from Moonrise PaperMC/Paper@77fcb29 Apply incremental player/level saving patch PaperMC/Paper@9fd7710 Apply automatic regionfile header recalculation patch PaperMC/Paper@b57b24d Do not try to stop main thread during watchdog shutdown PaperMC/Paper@2cd8c46 Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897) Gale Changes: Dreeam-qwq/Gale@8631b42 Updated Upstream (Paper) Dreeam-qwq/Gale@9b17b16 [ci skip] Add upstream commit msg generator Dreeam-qwq/Gale@75850c6 Updated Upstream (Paper) Dreeam-qwq/Gale@655a887 [ci skip] Update auto upstream Dreeam-qwq/Gale@c38b773 Updated Upstream (Paper) Dreeam-qwq/Gale@65a5517 Add back Optimize random calls in chunk ticking Purpur Changes: PurpurMC/Purpur@458dc18 Updated Upstream (Paper), closes #1556 PurpurMC/Purpur@87cf9f1 Updated Upstream (Paper)
50 lines
2.9 KiB
Diff
50 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
|
Date: Mon, 11 Sep 2023 15:47:19 -0400
|
|
Subject: [PATCH] Reduce canSee work
|
|
|
|
Co-authored by: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Co-authored by: MachineBreaker <machinebreaker>
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index fd23063ef316d6f1930a565c601bdf5b72bcfda1..9b8f6dc0db7e409a2e403caa65f2b4fed863c04e 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -854,17 +854,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
|
|
for (int i = 0, len = entities.size(); i < len; ++i) {
|
|
Entity entity = entities.get(i);
|
|
|
|
- if (checkCanSee && source instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer
|
|
- && !((net.minecraft.server.level.ServerPlayer) source).getBukkitEntity().canSee(((net.minecraft.server.level.ServerPlayer) entity).getBukkitEntity())) {
|
|
- continue;
|
|
- }
|
|
-
|
|
+ // Leaf - move up
|
|
// !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
|
|
// elide the last check since vanilla calls with entity = null
|
|
// only we care about the source for the canSee check
|
|
if (entity.isRemoved() || !entity.blocksBuilding) {
|
|
continue;
|
|
}
|
|
+ // Leaf end
|
|
+
|
|
+ if (checkCanSee && source instanceof net.minecraft.server.level.ServerPlayer && entity instanceof net.minecraft.server.level.ServerPlayer
|
|
+ && !((net.minecraft.server.level.ServerPlayer) source).getBukkitEntity().canSee(((net.minecraft.server.level.ServerPlayer) entity).getBukkitEntity())) {
|
|
+ continue;
|
|
+ }
|
|
|
|
if (net.minecraft.world.phys.shapes.Shapes.joinIsNotEmpty(voxelshape, net.minecraft.world.phys.shapes.Shapes.create(entity.getBoundingBox()), net.minecraft.world.phys.shapes.BooleanOp.AND)) {
|
|
return false;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 9325d2c676899fcedc360ea9183339c91af026dc..56c02c4e6ad55cc5757f1b227189ada513b2d560 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -638,6 +638,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
return false;
|
|
}
|
|
OfflinePlayer other = (OfflinePlayer) obj;
|
|
+ if (this == obj) return true; // Leaf - reduce canSee work
|
|
if ((this.getUniqueId() == null) || (other.getUniqueId() == null)) {
|
|
return false;
|
|
}
|