Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Add support for Folia#5291

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Draft
JRoy wants to merge24 commits into2.x
base:2.x
Choose a base branch
Loading
fromrefactor/folia
Draft
Changes from1 commit
Commits
Show all changes
24 commits
Select commitHold shift + click to select a range
15c48d4
Add Folia providers
JRoyMar 28, 2023
0e4bab2
Get like 70% of the plugin to work
JRoyMar 28, 2023
07fbf93
Ensure nuke commands runs on correct threads
JRoyMar 29, 2023
2088294
Actually fire init tasks in Folia
JRoyMar 29, 2023
a649f97
Add some thread checking helper methods
JRoyMar 29, 2023
04683ee
Fix async entity dismounts
JRoyMar 29, 2023
1d93ebf
Fix moo
JRoyMar 29, 2023
05a8aa8
Switch to Paper repo
JRoyMar 30, 2023
9a5ac3c
Fix tests
JRoyMar 30, 2023
4ff9286
Move over some discord things
JRoyMar 30, 2023
2d8cc82
Add method for checking the global thread
JRoyMar 30, 2023
7216fdd
Add helper methods for ensuring thread contexts
JRoyMar 30, 2023
2ba1eb0
fix "Fix moo"
JRoyApr 1, 2023
7279be7
allow DiscordMessageEvent calls from any context
JRoyApr 3, 2023
4cb861b
Run interaction commands async for now (hopefully okay)
JRoyApr 3, 2023
ec5007c
fix wrong period/timeunit for folia scheduling
JRoyApr 12, 2023
9133dce
Merge branch '2.x' into refactor/folia
JRoyApr 16, 2023
4256909
Fix folia init tasks never getting called LOLW
JRoyApr 27, 2023
10fc005
Merge remote-tracking branch 'upstream/2.x' into refactor/folia
JRoyJul 27, 2023
1a108b5
Bump folia version
JRoyJul 27, 2023
d4ebaf6
Fix weather command
JRoyJul 27, 2023
0c8bc16
Fix time command
JRoyJul 27, 2023
d0493cc
Merge remote-tracking branch 'upstream/2.x' into refactor/folia
JRoyAug 22, 2023
d73ed13
Fix time/weather commands
JRoyAug 22, 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
PrevPrevious commit
NextNext commit
Fix weather command
  • Loading branch information
@JRoy
JRoy committedJul 27, 2023
commitd4ebaf61d4549d64b15845a1b1cb4b058e7e7687
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,16 +31,18 @@ public void run(final Server server, final User user, final String commandLabel,
isStorm = args[0].equalsIgnoreCase("storm");
}

final World world = user.getWorld();
ess.scheduleEntityDelayedTask(user.getBase(), () -> {
final World world = user.getWorld();

if (args.length > 1) {
if (args.length > 1) {
world.setStorm(isStorm);
world.setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage(isStorm ? tl("weatherStormFor", world.getName(), args[1]) : tl("weatherSunFor", world.getName(), args[1]));
return;
}
world.setStorm(isStorm);
world.setWeatherDuration(Integer.parseInt(args[1]) * 20);
user.sendMessage(isStorm ? tl("weatherStormFor", world.getName(), args[1]) : tl("weatherSunFor", world.getName(), args[1]));
return;
}
world.setStorm(isStorm);
user.sendMessage(isStorm ? tl("weatherStorm", world.getName()) : tl("weatherSun", world.getName()));
user.sendMessage(isStorm ? tl("weatherStorm", world.getName()) : tl("weatherSun", world.getName()));
});
}

@Override
Expand All@@ -55,14 +57,16 @@ protected void run(final Server server, final CommandSource sender, final String
throw new Exception(tl("weatherInvalidWorld", args[0]));
}

if (args.length > 2) {
ess.scheduleLocationDelayedTask(world.getSpawnLocation(), () -> {
if (args.length > 2) {
world.setStorm(isStorm);
world.setWeatherDuration(Integer.parseInt(args[2]) * 20);
sender.sendMessage(isStorm ? tl("weatherStormFor", world.getName(), args[2]) : tl("weatherSunFor", world.getName(), args[2]));
return;
}
world.setStorm(isStorm);
world.setWeatherDuration(Integer.parseInt(args[2]) * 20);
sender.sendMessage(isStorm ? tl("weatherStormFor", world.getName(), args[2]) : tl("weatherSunFor", world.getName(), args[2]));
return;
}
world.setStorm(isStorm);
sender.sendMessage(isStorm ? tl("weatherStorm", world.getName()) : tl("weatherSun", world.getName()));
sender.sendMessage(isStorm ? tl("weatherStorm", world.getName()) : tl("weatherSun", world.getName()));
});
}

@Override
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp