Skip to content

Commit 31515a8

Browse files
author
UnKabaraQuiDev
committed
Using PCUtils#parseInteger instead of #toInteger; updated packet
broadcast methods in P4JServer; Updated to 0.8
1 parent cffe626 commit 31515a8

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>lu.pcy113</groupId>
88
<artifactId>packets4j</artifactId>
9-
<version>pre-release_0.7</version>
9+
<version>0.8</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Packets4J</name>
@@ -24,13 +24,14 @@
2424
<dependency>
2525
<groupId>lu.pcy113</groupId>
2626
<artifactId>PCLib</artifactId>
27-
<version>0.7</version>
27+
<version>0.8</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>lu.pcy113</groupId>
3131
<artifactId>jbcodec</artifactId>
32-
<version>2.2</version>
32+
<version>2.3</version>
3333
</dependency>
34+
3435
<dependency>
3536
<groupId>junit</groupId>
3637
<artifactId>junit</artifactId>

src/main/java/lu/pcy113/p4j/socket/client/P4JClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public P4JClient(CodecManager cm, EncryptionManager em, CompressionManager com)
7777
this.encryption = em;
7878
this.compression = com;
7979

80-
MAX_PACKET_SIZE = PCUtils.toInteger(System.getProperty("P4J_maxPacketSize"), MAX_PACKET_SIZE);
80+
MAX_PACKET_SIZE = PCUtils.parseInteger(System.getProperty("P4J_maxPacketSize"), MAX_PACKET_SIZE);
8181
}
8282

8383
/**

src/main/java/lu/pcy113/p4j/socket/server/P4JServer.java

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public P4JServer(CodecManager cm, EncryptionManager em, CompressionManager com)
6464
this.compression = com;
6565
this.clientManager = new ClientManager(this);
6666

67-
MAX_PACKET_SIZE = PCUtils.toInteger(System.getProperty("P4J_maxPacketSize"), MAX_PACKET_SIZE);
67+
MAX_PACKET_SIZE = PCUtils.parseInteger(System.getProperty("P4J_maxPacketSize"), MAX_PACKET_SIZE);
6868
}
6969

7070
/*
@@ -154,8 +154,6 @@ private void handleException(P4JServerException e) {
154154

155155
/**
156156
* Sends the packet to all the connected clients.
157-
*
158-
* @param S2CPacket the packet to send
159157
*/
160158
public void broadcast(S2CPacket<?> packet) {
161159
Objects.requireNonNull(packet);
@@ -165,10 +163,25 @@ public void broadcast(S2CPacket<?> packet) {
165163
}
166164
}
167165

166+
/**
167+
* Sends the packet to all the connected clients.
168+
*/
169+
public void broadcast(List<S2CPacket<?>> packets) {
170+
Objects.requireNonNull(packets);
171+
172+
if (packets.isEmpty()) {
173+
return;
174+
}
175+
176+
for (ServerClient sc : clientManager.getAllClients()) {
177+
for (S2CPacket<?> packet : packets) {
178+
sc.write(packet);
179+
}
180+
}
181+
}
182+
168183
/**
169184
* Sends the packet provided by the supplier to all the connected clients.
170-
*
171-
* @param S2CPacket the packet to send
172185
*/
173186
public void broadcast(Function<ServerClient, S2CPacket<?>> packetSupplier) {
174187
for (ServerClient sc : clientManager.getAllClients()) {
@@ -178,8 +191,6 @@ public void broadcast(Function<ServerClient, S2CPacket<?>> packetSupplier) {
178191

179192
/**
180193
* Iterates over all the connected clients and sends the specified packet if the predicate's condition is met.
181-
*
182-
* @param S2CPacket the packet to send
183194
*/
184195
public void broadcastIf(S2CPacket<?> packet, Predicate<ServerClient> condition) {
185196
Objects.requireNonNull(packet);
@@ -191,6 +202,9 @@ public void broadcastIf(S2CPacket<?> packet, Predicate<ServerClient> condition)
191202
}
192203
}
193204

205+
/**
206+
* Iterates over all the connected clients and sends the specified packet(s) if the predicate's condition is met.
207+
*/
194208
public void broadcastIf(List<S2CPacket<?>> packets, Predicate<ServerClient> condition) {
195209
Objects.requireNonNull(packets);
196210

@@ -209,8 +223,6 @@ public void broadcastIf(List<S2CPacket<?>> packets, Predicate<ServerClient> cond
209223

210224
/**
211225
* Iterates over all the connected clients and sends the packet provided by the supplier, if the predicate's condition is met.
212-
*
213-
* @param S2CPacket the packet to send
214226
*/
215227
public void broadcastIf(Function<ServerClient, S2CPacket<?>> packetSupplier, Predicate<ServerClient> condition) {
216228
for (ServerClient sc : clientManager.getAllClients()) {

0 commit comments

Comments
 (0)