Skip to content

Commit 81e21e5

Browse files
committed
version bump and fix login check
1 parent 8085e8c commit 81e21e5

File tree

4 files changed

+10
-23
lines changed

4 files changed

+10
-23
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>simplexity</groupId>
88
<artifactId>SimpleFly</artifactId>
9-
<version>0.0.1</version>
9+
<version>1.0.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimpleFly</name>

src/main/java/simplexity/simplefly/FlyListeners.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void onPlayerLogin(PlayerJoinEvent joinEvent) {
3535
return;
3636
}
3737
if (flyEnabled && !player.hasPermission(Constants.FLY_PERMISSION)) {
38-
FlyLogic.flyDisable(player);
38+
FlyLogic.disablePDC(player);
3939
}
4040
}, 10);
4141
}

src/main/java/simplexity/simplefly/FlyLogic.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public static void flyDisable(Player player){
4141
player.setFlying(false);
4242
}
4343

44+
public static void disablePDC(Player player){
45+
player.getPersistentDataContainer().set(flyStatus, PersistentDataType.BOOLEAN, false);
46+
}
47+
4448
private static boolean willFall(Player player){
4549
Location location = player.getLocation();
4650
Block blockBelow = location.clone().add(0, -1, 0).getBlock();

src/main/java/simplexity/simplefly/commands/Fly.java

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,42 +73,25 @@ private static int executeOnOtherWithArg(CommandContext<CommandSourceStack> ctx,
7373
sender.sendMessage(getParsedComponent(shouldEnable, player, sender, LocaleMessage.FLY_SET_OTHER.getMessage()));
7474
return Command.SINGLE_SUCCESS;
7575
}
76-
int modified = 0;
7776
for (Player player : targets) {
7877
FlyLogic.setFlyStatus(player, shouldEnable);
7978
player.sendMessage(getParsedComponent(shouldEnable, player, sender, LocaleMessage.FLY_SET_BY_OTHER.getMessage()));
80-
modified++;
81-
}
82-
String enabledString;
83-
if (shouldEnable) {
84-
enabledString = LocaleMessage.ENABLED.getMessage();
85-
} else {
86-
enabledString = LocaleMessage.DISABLED.getMessage();
8779
}
80+
String enabledString = shouldEnable ? LocaleMessage.ENABLED.getMessage() : LocaleMessage.DISABLED.getMessage();
8881
sender.sendRichMessage(LocaleMessage.FLY_SET_OTHER_MANY_ARG.getMessage(),
8982
Placeholder.parsed("value", enabledString),
90-
Placeholder.parsed("count", String.valueOf(modified)));
83+
Placeholder.parsed("count", String.valueOf(targets.size())));
9184
return Command.SINGLE_SUCCESS;
9285
}
9386

9487
private static void sendOwnMessage(boolean flyEnabled, Player player) {
95-
String enabledString;
96-
if (flyEnabled) {
97-
enabledString = LocaleMessage.ENABLED.getMessage();
98-
} else {
99-
enabledString = LocaleMessage.DISABLED.getMessage();
100-
}
88+
String enabledString = flyEnabled ? LocaleMessage.ENABLED.getMessage() : LocaleMessage.DISABLED.getMessage();
10189
player.sendRichMessage(LocaleMessage.FLY_SET_OWN.getMessage(),
10290
Placeholder.parsed("value", enabledString));
10391
}
10492

10593
private static Component getParsedComponent(boolean flyEnabled, Player target, CommandSender source, String message) {
106-
String enabledString;
107-
if (flyEnabled) {
108-
enabledString = LocaleMessage.ENABLED.getMessage();
109-
} else {
110-
enabledString = LocaleMessage.DISABLED.getMessage();
111-
}
94+
String enabledString = flyEnabled ? LocaleMessage.ENABLED.getMessage() : LocaleMessage.DISABLED.getMessage();
11295
Component targetName = target.displayName();
11396
Component senderName;
11497
if (source instanceof Player player) {

0 commit comments

Comments
 (0)