mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-20 23:49:31 +00:00
5365c49680
Upstream has released updates that appear to apply and compile correctly Gale Changes: Dreeam-qwq/Gale@1e0ebad Clean up Dreeam-qwq/Gale@9ce20fa throw MissingPaletteEntryException for null entries in hash palette Dreeam-qwq/Gale@751637d Final clean up imports
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 ad056c22eec4fae4f9d4a4b0ec901729f47b4774..02747911e13fc99df7a69f5d382782e07a375fd3 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -855,17 +855,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 7294c6cc2cf65e3c142d174025d24d854bbe68ae..c6964b6027e0ac57e3e01deae0da22665f2afc40 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -640,6 +640,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;
|
|
}
|