diff options
| author | Warrior <[email protected]> | 2023-05-08 16:17:00 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-08 16:17:00 +0200 |
| commit | 688409279f45ec4e88b7c1f91dc62ce377a71caf (patch) | |
| tree | e85d045ed1d4768157f76e2216f69c17c7898155 | |
| parent | 1d4c7806ffd09cc9ff3372793a60418ee6a869f0 (diff) | |
| download | Paper-688409279f45ec4e88b7c1f91dc62ce377a71caf.tar.gz Paper-688409279f45ec4e88b7c1f91dc62ce377a71caf.zip | |
Fix lightning being able to hit spectators (#9193)
| -rw-r--r-- | patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch index 519e58a711..998a3505a3 100644 --- a/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch @@ -35,6 +35,9 @@ https://bugs.mojang.com/browse/MC-259571 https://bugs.mojang.com/browse/MC-260219 Play sniffer eat sound for the last item +https://bugs.mojang.com/browse/MC-262422 + Fix lightning being able to hit spectators + Co-authored-by: William Blake Galbreath <[email protected]> diff --git a/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java b/src/main/java/net/minecraft/core/dispenser/DispenseItemBehavior.java @@ -76,6 +79,19 @@ index 43e77cef0fce75f59aeb05e161668bebb8fca229..ef50fbf8cb3f008827850b5ed3342200 } } +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index 131a7ff0847272b2f9fecf62d0d28ca014689f5b..ed91515947ee049bdb82aa014fe439753f2b7620 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -949,7 +949,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + } else { + AABB axisalignedbb = (new AABB(blockposition1, new BlockPos(blockposition1.getX(), this.getMaxBuildHeight(), blockposition1.getZ()))).inflate(3.0D); + List<LivingEntity> list = this.getEntitiesOfClass(LivingEntity.class, axisalignedbb, (entityliving) -> { +- return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition()); ++ return entityliving != null && entityliving.isAlive() && this.canSeeSky(entityliving.blockPosition()) && !entityliving.isSpectator(); // Paper - Fix lightning being able to hit spectators (MC-262422) + }); + + if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java index 45b48da09eafa8482836e49768426069b0a73cca..16a1416cb2ce01071a033c5049edfb60b614d56a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java |