Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-05-13 20:38:44 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:1c9d5c110268003c726ee01166bf7693604e3779
Branches Tags
Ellpeck:main
Ellpeck:1.19
Ellpeck:1.18
Ellpeck:1.16
Ellpeck:1.15
Ellpeck:1.14
Ellpeck:1.12
...
compare: Ellpeck:791c6ada5e4875154c1727fbca3f3742046b9d99
Branches Tags
Ellpeck:main
Ellpeck:1.19
Ellpeck:1.18
Ellpeck:1.16
Ellpeck:1.15
Ellpeck:1.14
Ellpeck:1.12

2 commits
1c9d5c1102 ... 791c6ada5e

Author SHA1 Message Date
Ell 791c6ada5e fixed effect inhibitor crash 
closes #328
 2023-09-25 13:42:06 +02:00
Ell 41214e7b2f fixed a rare race condition (?) when iterating block entities 
closes #329
 2023-09-25 13:35:42 +02:00
2 changed files with 7 additions and 4 deletions
Show stats Expand all files Collapse all files

6
src/main/java/de/ellpeck/naturesaura/Helper.java
View file

@ -67,9 +67,11 @@ public final class Helper {
var chunk = Helper.getLoadedChunk(level, x, z);
if (chunk != null) {
for (var tilePos : chunk.getBlockEntitiesPos()) {
if (tilePos.distSqr(pos) <= radius * radius)
if (consumer.apply(chunk.getBlockEntity(tilePos)))
if (tilePos.distSqr(pos) <= radius * radius) {
var tile = chunk.getBlockEntity(tilePos);
if (tile != null && consumer.apply(tile))
return true;
}
}
}
}

5
src/main/java/de/ellpeck/naturesaura/entities/EntityEffectInhibitor.java
View file

@ -68,7 +68,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
@Override
protected void defineSynchedData() {
this.entityData.define(EntityEffectInhibitor.INHIBITED_EFFECT, null);
this.entityData.define(EntityEffectInhibitor.INHIBITED_EFFECT, "");
this.entityData.define(EntityEffectInhibitor.COLOR, 0);
this.entityData.define(EntityEffectInhibitor.AMOUNT, 0);
}
@ -168,7 +168,7 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
}
public void setInhibitedEffect(ResourceLocation effect) {
this.entityData.set(EntityEffectInhibitor.INHIBITED_EFFECT, effect != null ? effect.toString() : null);
this.entityData.set(EntityEffectInhibitor.INHIBITED_EFFECT, effect != null ? effect.toString() : "");
}
public int getColor() {
@ -212,4 +212,5 @@ public class EntityEffectInhibitor extends Entity implements IVisualizable {
this.powderListDirty = false;
this.lastEffect = inhibitedEffect;
}
}