Skip to content

Replace improper usage of BetweenlandsWorldStorage.forWorld() #1383

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

Open
JoshieGemFinder wants to merge 2 commits into
base: 1.12-fixes
Choose a base branch
from
Open

Replace improper usage of BetweenlandsWorldStorage.forWorld() #1383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446bead
Update CommandBLEvent.java
JoshieGemFinder Sep 4, 2023
d0a406d
Update EnvironmentEventHandler.java
JoshieGemFinder Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/thebetweenlands/common/command/CommandBLEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void processEventState(ICommandSender sender, ResourceLocation eventName

@Override
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
if (BetweenlandsWorldStorage.forWorld(sender.getEntityWorld()) == null) {
if (BetweenlandsWorldStorage.forWorldNullable(sender.getEntityWorld()) == null) {
return Collections.<String>emptyList();
}
List<String> completions = null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private EnvironmentEventHandler() { }
@SubscribeEvent
public static void onWorldTick(WorldTickEvent event) {
if(event.phase == Phase.END && !event.world.isRemote) {
BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorld(event.world);
BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorldNullable(event.world);

if(storage != null) {
BLEnvironmentEventRegistry reg = storage.getEnvironmentEventRegistry();
Expand Down