Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve kill effect #7148

Merged
merged 19 commits into from
Dec 31, 2024
Merged

Improve kill effect #7148

merged 19 commits into from
Dec 31, 2024

Conversation

EquipableMC
Copy link
Contributor

Description

This simply improves the kill effect by adding an option to prevent totems from popping

Target Minecraft Versions: any
Requirements: none
Related Issues: none

Efnilite
Efnilite requested changes Oct 14, 2024
View reviewed changes
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
@Efnilite Efnilite added the bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. label Oct 14, 2024
Efnilite
Efnilite requested changes Dec 26, 2024
View reviewed changes
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
@EquipableMC EquipableMC requested a review from Efnilite December 26, 2024 22:22
Efnilite
Efnilite requested changes Dec 28, 2024
View reviewed changes
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/effects/EffKill.java Outdated Show resolved Hide resolved
@EquipableMC
Copy link
Contributor Author

I removed ignoring the totem of undying and removed setting the player to survival from creative, then back as that was unneeded, which is now making this a breaking change.

@EquipableMC EquipableMC requested a review from Efnilite December 28, 2024 14:36
Efnilite
Efnilite approved these changes Dec 28, 2024
View reviewed changes
Copy link
Member

@Efnilite Efnilite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be a breaking change as the kill effect will now always kill, no matter if the player has a totem. in my opinion, this is expected behaviour, and therefore not a big deal

@Efnilite Efnilite added the breaking changes Pull or feature requests that contain breaking changes (API, syntax, etc.) label Dec 28, 2024
@Moderocky @Efnilite
Update src/main/java/ch/njol/skript/effects/EffKill.java
3675d02 
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
@Moderocky Moderocky added 2.10 Targeting a 2.10.X version release feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. labels Dec 31, 2024
@Moderocky Moderocky merged commit bf32598 into SkriptLang:dev/feature Dec 31, 2024
5 checks passed
@EquipableMC EquipableMC deleted the improve-kill-effect branch December 31, 2024 14:49
@EquipableMC EquipableMC mentioned this pull request Jan 13, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sparky200 Sparky200 Sparky200 approved these changes

@Efnilite Efnilite Efnilite approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

@Moderocky Moderocky Moderocky approved these changes

@sovdeeth sovdeeth sovdeeth approved these changes

Assignees
No one assigned
Labels
2.10 Targeting a 2.10.X version release breaking changes Pull or feature requests that contain breaking changes (API, syntax, etc.) bug An issue that needs to be fixed. Alternatively, a PR fixing an issue. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@EquipableMC @sovdeeth @Moderocky @APickledWalrus @Efnilite @Sparky200 @cheeezburga