-
-
Notifications
You must be signed in to change notification settings - Fork 414
Llama+TraderLlama Fix & ExprSpawnerType #7951
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.
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
Merged
APickledWalrus
merged 11 commits into
SkriptLang:dev/feature
from
Absolutionism:dev/Llama+TraderLlama-Fix
Jun 30, 2025
Merged
Llama+TraderLlama Fix & ExprSpawnerType #7951
APickledWalrus
merged 11 commits into
SkriptLang:dev/feature
from
Absolutionism:dev/Llama+TraderLlama-Fix
Jun 30, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sovdeeth
approved these changes
Jun 15, 2025
Closed
1 task
sovdeeth
approved these changes
Jun 16, 2025
APickledWalrus
requested changes
Jun 30, 2025
APickledWalrus
approved these changes
Jun 30, 2025
Burbulinis
pushed a commit
to Burbulinis/Skript
that referenced
this pull request
Jul 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Since Bukkit's EntityType has a value for both
LLAMAandTRADER_LLAMAby having both of these types being handled/combined in the same EntityData class, lead to some unsavory issues (linked issue).Solution
Updates
LlamaData,#init, #IsSuperOf, #matchand removes the checks for theTraderLlama.classNote: I did update
ExprSpawnerTypebecause the linked issue mentioned the spawner specifically, so I was at that class first.Updates to current code+doc conventions, and adds
DELETEchangemodeTesting Completed
7951-llama and trader llama.skSupporting Information
N/A
Completes: #5439
Related: none