SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead diff, some name/diff cleanup

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-20 12:00:24 +01:00
parent 6e0c8776e6
commit 42a2ccff55
9 changed files with 34 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
paper-server/patches/sources/net/minecraft/world/effect/MobEffectUtil.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/effect/MobEffectUtil.java
+++ b/net/minecraft/world/effect/MobEffectUtil.java
@@ -47,18 +_,31 @@
@@ -47,18 +_,38 @@
public static List<ServerPlayer> addEffectToPlayersAround(
ServerLevel level, @Nullable Entity source, Vec3 pos, double radius, MobEffectInstance effect, int duration
) {
@@ -17,28 +17,31 @@
+ // Paper end - Add ElderGuardianAppearanceEvent
+ // CraftBukkit end
Holder<MobEffect> effect1 = effect.getEffect();
- List<ServerPlayer> players = level.getPlayers(
List<ServerPlayer> players = level.getPlayers(
- serverPlayer -> serverPlayer.gameMode.isSurvival()
- && (source == null || !source.isAlliedTo(serverPlayer))
- && pos.closerThan(serverPlayer.position(), radius)
- && (
+ // Paper start - Add ElderGuardianAppearanceEvent
+ serverPlayer -> {
+ final boolean condition = serverPlayer.gameMode.isSurvival()
&& (source == null || !source.isAlliedTo(serverPlayer))
&& pos.closerThan(serverPlayer.position(), radius)
&& (
- !serverPlayer.hasEffect(effect1)
- || serverPlayer.getEffect(effect1).getAmplifier() < effect.getAmplifier()
- || serverPlayer.getEffect(effect1).endsWithin(duration - 1)
- )
- );
- players.forEach(serverPlayer -> serverPlayer.addEffect(new MobEffectInstance(effect), source));
+ List<ServerPlayer> players = level.getPlayers((entityplayer) -> {
+ // Paper start - Add ElderGuardianAppearanceEvent
+ boolean condition = entityplayer.gameMode.isSurvival() && (source == null || !source.isAlliedTo((Entity) entityplayer)) && pos.closerThan(entityplayer.position(), radius) && (!entityplayer.hasEffect(effect1) || entityplayer.getEffect(effect1).getAmplifier() < effect.getAmplifier() || entityplayer.getEffect(effect1).endsWithin(duration - 1));
+ !serverPlayer.hasEffect(effect1)
+ || serverPlayer.getEffect(effect1).getAmplifier() < effect.getAmplifier()
+ || serverPlayer.getEffect(effect1).endsWithin(duration - 1)
+ );
+ if (condition) {
+ return playerPredicate == null || playerPredicate.test(entityplayer); // Only test the player AFTER it is true
+ return playerPredicate == null || playerPredicate.test(serverPlayer); // Only test the player AFTER it is true
+ } else {
+ return false;
+ }
+ // Paper end - Add ElderGuardianAppearanceEvent
+ });
+
+ // Paper end - Add ElderGuardianAppearanceEvent
+ players.forEach(serverPlayer -> serverPlayer.addEffect(new MobEffectInstance(effect), source, cause)); // CraftBukkit
return players;
}