Skip to content

Commit df40c5c

Browse files
authored
1.0-Release
Resolved following Bugs - Teleportation Bug - Data Storage Discrepancies
1 parent f5b1f9e commit df40c5c

File tree

6 files changed

+49
-29
lines changed

6 files changed

+49
-29
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>dev.arcticgaming</groupId>
88
<artifactId>OpenTickets</artifactId>
9-
<version>0.2-alpha</version>
9+
<version>1.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>OpenTickets</name>

src/main/java/dev/arcticgaming/opentickets/Listeners/InventoryClickEventListener.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.arcticgaming.opentickets.Listeners;
22

3+
import dev.arcticgaming.opentickets.GUI.TicketViewer;
34
import dev.arcticgaming.opentickets.Objects.Ticket;
45
import dev.arcticgaming.opentickets.OpenTickets;
56
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
@@ -27,7 +28,7 @@ public static void inventoryClickEventListener(InventoryClickEvent event){
2728
ItemStack item = event.getCurrentItem();
2829
Player player = Bukkit.getPlayer(event.getWhoClicked().getUniqueId());
2930

30-
if (inventoryName.contains("Ticket Viewer") && item != null){
31+
if (inventoryName.contains("Ticket Viewer") && item != null && player != null){
3132
event.setCancelled(true);
3233
ClickType clickType = event.getClick();
3334

@@ -37,8 +38,12 @@ public static void inventoryClickEventListener(InventoryClickEvent event){
3738

3839
switch (clickType) {
3940
case LEFT -> {
40-
assert player != null;
41-
Location location = new Location(Bukkit.getWorld(ticket.getWorld()), ticket.getX(), ticket.getY(), ticket.getZ());
41+
42+
double x = Double.parseDouble(ticket.getX());
43+
double y = Double.parseDouble(ticket.getY());
44+
double z = Double.parseDouble(ticket.getZ());
45+
46+
Location location = new Location(Bukkit.getWorld(ticket.getWorld()), x, y, z);
4247
player.teleport(location);
4348
}
4449
case RIGHT -> {
@@ -48,6 +53,8 @@ public static void inventoryClickEventListener(InventoryClickEvent event){
4853
} catch (IOException e) {
4954
e.printStackTrace();
5055
}
56+
player.closeInventory();
57+
new TicketViewer().ticketViewer(player);
5158
}
5259
case SHIFT_RIGHT -> {
5360
Ticket.closeTicket(ticket);
@@ -56,6 +63,8 @@ public static void inventoryClickEventListener(InventoryClickEvent event){
5663
} catch (IOException e) {
5764
e.printStackTrace();
5865
}
66+
player.closeInventory();
67+
new TicketViewer().ticketViewer(player);
5968
}
6069
default -> {
6170
}
Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
package dev.arcticgaming.opentickets.Listeners;
22

3+
import dev.arcticgaming.opentickets.OpenTickets;
34
import net.kyori.adventure.text.Component;
5+
import net.kyori.adventure.text.TextComponent;
6+
import net.kyori.adventure.text.event.ClickEvent;
47
import net.kyori.adventure.text.format.TextColor;
8+
import org.bukkit.Bukkit;
59
import org.bukkit.entity.Player;
610
import org.bukkit.event.EventHandler;
711
import org.bukkit.event.Listener;
812
import org.bukkit.event.player.PlayerLoginEvent;
13+
import org.w3c.dom.Text;
914

1015
public class PlayerLoginEventListener implements Listener {
1116

17+
18+
1219
@EventHandler
1320
public static void playerLoginEventListener(PlayerLoginEvent event){
1421

1522
Player player = event.getPlayer();
1623

17-
if (player.hasPermission("opentickets.admin")){
1824

19-
Component priorityMessage = Component.text()
20-
.content("[Open Tickets] Tickets open with Level 2 priority!")
21-
.color(TextColor.color(0xf05800))
22-
.build();
2325

24-
player.sendMessage(priorityMessage);
25-
}
26+
if (player.hasPermission("opentickets.admin")) {
27+
28+
Component notification = Component.text()
29+
.content("==============================================\n").color(TextColor.color(0xffea00))
30+
.append(Component.text("\nThere are open support tickets!\n")
31+
.color(TextColor.color(0xffaa00)).clickEvent(ClickEvent.suggestCommand("/viewtickets")))
32+
.append(Component.text("\n==============================================\n").color(TextColor.color(0xffea00)))
33+
.build();
2634

2735

36+
Runnable message = () -> {
37+
player.sendMessage(notification);
38+
};
39+
Bukkit.getScheduler().runTaskLater(OpenTickets.getPlugin(), message, 20);
40+
}
2841
}
2942
}

src/main/java/dev/arcticgaming/opentickets/Objects/Ticket.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ public class Ticket {
2323
@Getter @Setter public UUID ticketUUID;
2424
@Getter @Setter public UUID playerUUID;
2525
@Getter @Setter public String playerName;
26-
2726
@Getter @Setter String world;
28-
@Getter @Setter double x;
29-
@Getter @Setter double y;
30-
@Getter @Setter double z;
27+
@Getter @Setter String x;
28+
@Getter @Setter String y;
29+
@Getter @Setter String z;
3130
@Getter @Setter public int priority;
3231
@Getter @Setter public String note;
3332

@@ -36,18 +35,18 @@ public class Ticket {
3635
public Ticket(Player player, String note) {
3736

3837
if (player == null) {
39-
this.x = 0;
40-
this.y = 70;
41-
this.z = 0;
38+
this.x = "0";
39+
this.y = "70";
40+
this.z = "0";
4241
this.world = "world";
4342
this.playerName = "null Player";
4443
this.playerUUID = UUID.randomUUID();
4544
} else {
4645
Location location = player.getLocation();
4746
this.world = location.getWorld().getName();
48-
this.x = location.getX();
49-
this.y = location.getY();
50-
this.z = location.getZ();
47+
this.x = ("" + location.getX());
48+
this.y = ("" + location.getY());
49+
this.z = ("" + location.getZ());
5150
this.playerUUID = player.getUniqueId();
5251
this.playerName = player.getName();
5352
}

src/main/java/dev/arcticgaming/opentickets/OpenTickets.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ public void onEnable() {
5252
@Override
5353
public void onDisable() {
5454
// Plugin shutdown logic
55-
try {
56-
Ticket.saveTickets();
57-
} catch (IOException e) {
58-
throw new RuntimeException(e);
59-
}
55+
6056
}
6157

6258
public static void initTickets() throws FileNotFoundException {

src/main/java/dev/arcticgaming/opentickets/Utils/TicketDeserializer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ public Ticket deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
1616
String storedNote = jsonObject.get("note").getAsString();
1717

1818
Ticket ticket = new Ticket(Bukkit.getPlayer(playerUUID), storedNote);
19+
1920
ticket.setTicketUUID(UUID.fromString(jsonObject.get("ticketUUID").getAsString()));
21+
2022
ticket.setPlayerUUID(playerUUID);
2123
ticket.setWorld(jsonObject.get("world").getAsString());
22-
ticket.setX(jsonObject.get("x").getAsDouble());
23-
ticket.setY(jsonObject.get("y").getAsDouble());
24-
ticket.setX(jsonObject.get("z").getAsDouble());
24+
ticket.setX(jsonObject.get("x").getAsString());
25+
ticket.setY(jsonObject.get("y").getAsString());
26+
ticket.setZ(jsonObject.get("z").getAsString());
27+
ticket.setPriority(jsonObject.get("priority").getAsInt());
2528
ticket.setPlayerName(jsonObject.get("playerName").getAsString());
2629

2730
return ticket;

0 commit comments

Comments
 (0)