Skip to content
This repository was archived by the owner on Jan 31, 2022. It is now read-only.

Commit d6520cb

Browse files
author
qPexLegendary
committed
Исправлен баг, который при использовании формы созданной не FormAPI вызывает лямбда-функцию
1 parent 869e3ec commit d6520cb

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/ru/nukkitx/events/EventListener.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,15 @@ public void formResponded(PlayerFormRespondedEvent event) {
2828

2929
if (response == null) return;
3030

31-
if (Form.playersForm.containsKey(player.getName())) {
31+
if (Form.playersForm.containsKey(player.getName()) && Form.paramsForm.containsKey(player.getName())) {
32+
ru.nukkitx.forms.FormResponse temp = Form.playersForm.get(player.getName());
33+
Form.playersForm.remove(player.getName());
34+
3235
Object data;
3336

3437
if (event.wasClosed()) {
3538
data = null;
36-
Form.playersForm.get(player.getName()).handle(player, window, data, Form.paramsForm.get(player.getName()));
39+
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
3740
return;
3841
}
3942

@@ -45,13 +48,13 @@ public void formResponded(PlayerFormRespondedEvent event) {
4548

4649
if (window instanceof FormWindowCustom) {
4750
data = new ArrayList<>(((FormResponseCustom) response).getResponses().values());
48-
Form.playersForm.get(player.getName()).handle(player, window, data, Form.paramsForm.get(player.getName()));
51+
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
4952
return;
5053
}
5154

5255
if (window instanceof FormWindowModal) {
5356
data = ((FormResponseModal) response).getClickedButtonId();
54-
Form.playersForm.get(player.getName()).handle(player, window, data, Form.paramsForm.get(player.getName()));
57+
temp.handle(player, window, data, Form.paramsForm.get(player.getName()));
5558
return;
5659
}
5760
}

src/main/java/ru/nukkitx/forms/Form.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ public abstract class Form {
1111
protected FormWindow form;
1212

1313
public final void send(Player player) {
14-
playersForm.remove(player.getName());
15-
paramsForm.remove(player.getName());
1614
player.showFormWindow(form);
1715
}
1816

src/main/resources/plugin.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ main: ru.nukkitx.FormAPI
33
api: "1.0.9"
44
version: "1.0"
55
author: qPexLegendary
6+
load: STARTUP
67
authors:
78
- qPexLegendary
89
- kkdevs

0 commit comments

Comments
 (0)