mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-22 16:39:22 +00:00
e703cd5445
* Update Leaf API patches to 1.20.5 * Updated Upstream (Purpur API) * Some server patches work * Update 1.20.6 * Some server patches work * Some some server patches work * 0oO0oO0oOo * iI1IiI1i|!il| * Updated Upstream (Gale/Purpur) * Server patches work * Updated Upstream (Gale)
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 a3adc109213885a193f7131405bd4a2f6a90f9be..e971ef13754402f3de118ea24cb9f83b564cd65e 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -388,17 +388,19 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
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 bdc69aed63d1d84a398c25ccf3dabc7ae123fad8..753e5a1c99e427729c4bcb5378005fc8012996ab 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -627,6 +627,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;
|
|
}
|