Add Collidable elements #6708
Add Collidable elements #6708
Conversation
src/main/java/ch/njol/skript/expressions/ExprCollidableState.java
Outdated
Show resolved
Hide resolved
src/main/java/ch/njol/skript/expressions/ExprCollidableState.java
Outdated
Show resolved
Hide resolved
|
Maybe also add collidable exemptions as part of this PR? Also I feel like an effect might work better than an expression seeing as it can only be set to true or false, similar to the invulnerable syntax. |
| @Override | ||
| public void change(Event event, @Nullable Object[] delta, Changer.ChangeMode mode) { | ||
| List<UUID> uuidList = new ArrayList<>(); | ||
| if (delta != null){ | ||
| for (Object object : delta){ | ||
| if (object instanceof LivingEntity) | ||
| uuidList.add(((LivingEntity) object).getUniqueId()); | ||
| } | ||
| } | ||
| switch (mode) { | ||
| case SET: | ||
| case DELETE: | ||
| case RESET: | ||
| getExpr().stream(event).forEach(livingEntity -> { | ||
| livingEntity.getCollidableExemptions().clear(); | ||
| if (!uuidList.isEmpty()) { | ||
| livingEntity.getCollidableExemptions().addAll(uuidList); | ||
| } | ||
| }); | ||
| break; | ||
| case ADD: | ||
| getExpr().stream(event).forEach(livingEntity -> | ||
| livingEntity.getCollidableExemptions().addAll(uuidList)); | ||
| break; | ||
| case REMOVE: | ||
| getExpr().stream(event).forEach(livingEntity -> | ||
| uuidList.forEach(livingEntity.getCollidableExemptions()::remove)); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
you should try to make it less repetitive
There was a problem hiding this comment.
Out of curiosity how would you propose it?
There was a problem hiding this comment.
Out of curiosity how would you propose it?
so above the switch, you would do
getExpr().stream(event).forEach(livingEntity -> {
List<UUID> exemptions = livingEntity.getCollidableExemptions();
and then you could do exemptions.addAll(uuidlist) or exemptions.clear instead of redoing the stream everytime
my logic could also be completely wrong, but idk 🤷
There was a problem hiding this comment.
This is indeed applicable, which all left is the unexpected unforeseen bump ahead 😬
| protected LivingEntity[] get(Event event, LivingEntity[] source) { | ||
| List<LivingEntity> entities = new ArrayList<>(); | ||
| for (LivingEntity livingEntity : source){ | ||
| livingEntity.getCollidableExemptions().forEach(uuid -> { |
There was a problem hiding this comment.
Can't do a full review rn but this isn't reliable
This needs to return uuids, because the entities it returns will change based on loaded chunks
Description
I added CondIsCollidable, ExprCollidableState and ExprCollidableExemptions
Target Minecraft Versions: any
Requirements: none
Related Issues: none