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

Adds some more taming syntax #6850

Merged
merged 11 commits into from
Aug 15, 2024
Merged

Adds some more taming syntax #6850

merged 11 commits into from
Aug 15, 2024

Conversation

cheeezburga
Copy link
Member

This PR adds an effect to tame an entity and a condition to check if an entity is tamed.

NotSoDelayed
NotSoDelayed suggested changes Jul 2, 2024
View reviewed changes
Copy link
Contributor

@NotSoDelayed NotSoDelayed left a comment

Choose a reason for hiding this comment

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

Add missing Skript docs

@sovdeeth sovdeeth added the feature Pull request adding a new feature. label Jul 2, 2024
cheeezburga and others added 2 commits July 3, 2024 17:27
@cheeezburga @NotSoDelayed
NotSoDelayed Suggestions
755f35a 
Co-authored-by: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com>
@cheeezburga
Suggestions
da4199b 
- Removed 'de' as an option to untame a tameable entity
- Adds untaming to test
- Deletes value within variables instead of killing
cheeezburga and others added 2 commits July 4, 2024 15:55
@cheeezburga
Changed tests slightly
8548ecf
@cheeezburga @NotSoDelayed
Auggestion
1f58aa7 
Co-authored-by: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com>
TheLimeGlass
TheLimeGlass previously requested changes Jul 21, 2024
View reviewed changes
Copy link
Collaborator

@TheLimeGlass TheLimeGlass left a comment

Choose a reason for hiding this comment

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

Looking good pull request

src/main/java/ch/njol/skript/conditions/CondIsTamed.java Outdated Show resolved Hide resolved
@sovdeeth sovdeeth added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Jul 22, 2024
@sovdeeth sovdeeth merged commit bc0fe53 into SkriptLang:dev/feature Aug 15, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sovdeeth sovdeeth sovdeeth approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

@NotSoDelayed NotSoDelayed NotSoDelayed approved these changes

@TheLimeGlass TheLimeGlass Awaiting requested review from TheLimeGlass

Assignees
No one assigned
Labels
feature Pull request adding a new feature. 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.
5 participants
@cheeezburga @sovdeeth @TheLimeGlass @APickledWalrus @NotSoDelayed