geforkt von Mirrors/Paper
Keep fully frozen entities fully activated (#10103)
* Keep fully frozen entities fully activated * Rebase and switch to isFreezing --------- Co-authored-by: Bjarne Koll <lynxplay101@gmail.com>
Dieser Commit ist enthalten in:
Ursprung
692db0c81d
Commit
509876d26f
@ -380,7 +380,7 @@ index 45f55c79a9d105f732054d61c4cf83eb5db49762..17a6327ab7b26dfab38881bbc0689b0b
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index d5374072a97f791964033d107f023b3cc657b343..f76b3f410fcc756bb34a5fac21b1d7088ac7a9ce 100644
|
||||
index d5374072a97f791964033d107f023b3cc657b343..3495981419a75efe42bce45a89a32378dd6b8372 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -1,39 +1,52 @@
|
||||
@ -618,7 +618,7 @@ index d5374072a97f791964033d107f023b3cc657b343..f76b3f410fcc756bb34a5fac21b1d708
|
||||
{
|
||||
LivingEntity living = (LivingEntity) entity;
|
||||
- if ( /*TODO: Missed mapping? living.attackTicks > 0 || */ living.hurtTime > 0 || living.activeEffects.size() > 0 )
|
||||
+ if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper
|
||||
+ if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 || living.isFreezing()) // Paper
|
||||
{
|
||||
- return true;
|
||||
+ return 1; // Paper
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren