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

Add targeted block components to PlayerLocationVariable #1350

Merged
merged 6 commits into from
Jul 7, 2024
Merged

Add targeted block components to PlayerLocationVariable #1350

merged 6 commits into from
Jul 7, 2024

Conversation

cswhite2000
Copy link
Member

@cswhite2000 cswhite2000 commented Jul 3, 2024 •
edited by Pablete1234
Loading

Adds a few new components to player-location variables.

    HAS_TARGET,
    TARGET_X,
    TARGET_Y,
    TARGET_Z,
    PLACE_X,
    PLACE_Y,
    PLACE_Z,

not sure whether caching here is worth it.

Pablete1234
Pablete1234 reviewed Jul 6, 2024
View reviewed changes
Copy link
Member

@Pablete1234 Pablete1234 left a comment

Choose a reason for hiding this comment

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

consider also adding HAS_TARGET with 1 or 0 based on if the raycast found anything or not. I'm unsure as to what getBlock() returns if there was nothing found, but if there's potential for a NPE you should instead return 0 or -1 or something.

core/src/main/java/tc/oc/pgm/variables/types/PlayerLocationVariable.java Outdated Show resolved Hide resolved
@cswhite2000 cswhite2000 marked this pull request as ready for review July 6, 2024 18:39
@cswhite2000
Add targeted block components to PlayerLocationVariable
db36830 
Signed-off-by: Christopher White <18whitechristop@gmail.com>
@cswhite2000
Add has_target and modify location caching
6fdb0b7 
Signed-off-by: Christopher White <18whitechristop@gmail.com>
@cswhite2000
prevent NPEs
e9ab112 
Signed-off-by: Christopher White <18whitechristop@gmail.com>
cswhite2000 and others added 2 commits July 6, 2024 18:47
@cswhite2000
Merge branch 'dev' into more-loc
745b131
@cswhite2000
Make null default -1
a4e151a 
Signed-off-by: Christopher White <18whitechristop@gmail.com>
@Pablete1234
Remove comment
e22c5c5 
Signed-off-by: Pablo Herrera <pabloherrerapalacio@gmail.com>
@Pablete1234 Pablete1234 merged commit b6aff12 into dev Jul 7, 2024
2 checks passed
@Pablete1234 Pablete1234 deleted the more-loc branch July 7, 2024 02:23
@Pablete1234 Pablete1234 mentioned this pull request Aug 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pablete1234 Pablete1234 Pablete1234 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cswhite2000 @Pablete1234