Teleport Entities to Correct World#182
Merged
Merged
Conversation
21 tasks
nicegamer7
force-pushed
the
entities
branch
3 times, most recently
from
34bc451 to
354718a
Compare
dumptruckman
previously approved these changes
Oct 6, 2020
dumptruckman
left a comment
dumptruckman
left a comment
Member
There was a problem hiding this comment.
Awesome. Nice to see this super old request tackled.
Comment on lines
+128
to
+170
| @Nullable | ||
| private Location getLocation(Entity e, Location currentLocation, PortalType type, String currentWorld, String linkedWorld) { | ||
| Location newTo; | ||
| if (currentWorld.equalsIgnoreCase(linkedWorld)) { | ||
| newTo = null; | ||
| } else if (linkedWorld != null) { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, linkedWorld, e); | ||
| } else if (this.nameChecker.isValidNetherName(currentWorld)) { | ||
| if (type == PortalType.NETHER) { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getNormalName(currentWorld, PortalType.NETHER), e); | ||
| } else { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getEndName(this.nameChecker.getNormalName(currentWorld, PortalType.NETHER)), e); | ||
| } | ||
| } else if (this.nameChecker.isValidEndName(currentWorld)) { | ||
| if (type == PortalType.NETHER) { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getNetherName(this.nameChecker.getNormalName(currentWorld, PortalType.ENDER)), e); | ||
| } else { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getNormalName(currentWorld, PortalType.ENDER), e); | ||
| } | ||
| } else { | ||
| if (type == PortalType.ENDER) { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getEndName(currentWorld), e); | ||
| } else { | ||
| newTo = this.linkChecker.findNewTeleportLocation(currentLocation, this.nameChecker.getNetherName(currentWorld), e); | ||
| } | ||
| } | ||
|
|
||
| return newTo; | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
The cognitive complexity is quite high for this method. It could be a good place to introduce a new class to handle this.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR makes it so that when an entity enters a portal, they are teleported to the correct world. This fixes #72.
Note, this PR is equivalent to #156, but is rebased on the
event_tweaksbranch. I will not be making any further changes.