aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhackthetime <l4bg0jb7@duck.com>2023-12-15 13:16:54 +0100
committerhackthetime <l4bg0jb7@duck.com>2023-12-15 13:16:54 +0100
commitf78c95168e0c055dadfbdc91db5e254f89c94650 (patch)
tree0342902252eb7ce02ddf10d494d1e3a05f433ebb
parentd7bd502812504373a3d4e181fa4635145d1c10be (diff)
downloadBBsentials-f78c95168e0c055dadfbdc91db5e254f89c94650.tar.gz
BBsentials-f78c95168e0c055dadfbdc91db5e254f89c94650.tar.bz2
BBsentials-f78c95168e0c055dadfbdc91db5e254f89c94650.zip
small change otg with missing push from desktop
-rw-r--r--.gitignore6
-rw-r--r--common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java6
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java2
3 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 0201f9b..0624e31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,8 @@ logs
/run/config/
/run/saves/temp
/run/saves/temp/*
-/run/saves \ No newline at end of file
+/run/saves
+/runforge/.mixin.out/*
+/run/servers.dat
+/run/servers.dat_old
+/runforge/config/splash.properties
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
index 6aab4ce..fbba212 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
@@ -5,14 +5,16 @@ import de.hype.bbsentials.common.constants.enviromentShared.ChChestItem;
public class ChChestPacket extends AbstractPacket {
/**
+ * @param lobbyId the id of the lobby
* @param announcerUsername person who found the chest.
* @param items items contained in the chest. {@link de.hype.bbsentials.common.constants.enviromentShared.ChChestItems (available constants)}
* @param locationCoords coordinates of the chest.
* @param bbcommand command that shall be executed in game to get an invitation to the party.
* @param extraMessage a message that is optional to be provided by the announcer for custom additional info
*/
- public ChChestPacket(String announcerUsername, ChChestItem[] items, String locationCoords, String bbcommand, String extraMessage) {
+ public ChChestPacket(int lobbyId, String announcerUsername, ChChestItem[] items, String locationCoords, String bbcommand, String extraMessage) {
super(1, 1); //Min and Max supported Version
+ this.lobbyId = lobbyId;
this.announcerUsername = announcerUsername;
this.locationCoords = locationCoords;
this.bbcommand = bbcommand;
@@ -20,10 +22,10 @@ public class ChChestPacket extends AbstractPacket {
this.items = items;
}
+ public final int lobbyId;
public final String announcerUsername;
public final String locationCoords;
public final String bbcommand;
public final String extraMessage;
public final ChChestItem[] items;
-
}
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java b/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
index f3a6d80..59de7c5 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
@@ -83,7 +83,7 @@ public class Commands implements MCCommand {
int z = IntegerArgumentType.getInteger(context, "Z");
String contactWay = StringArgumentType.getString(context, "ContactWay");
- sendPacket(new ChChestPacket("", ChChestItems.getItem(item.split(";")), x + " " + y + " " + z, contactWay, ""));
+ sendPacket(new ChChestPacket(0, "", ChChestItems.getItem(item.split(";")), x + " " + y + " " + z, contactWay, ""));
return 1;
}
)