2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-05 08:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow multiple players per test

Browse Source 
Refactors the test helpers to use receiver functions so multiple players
can exist in the world per test case.  The AddFriendsTest is an example
of where this is needed.

Additionally, Hamcrest has been replaced with AssertJ for fluent
assertions.
This commit is contained in:
Gary Tierney
2017-06-20 02:13:47 +01:00
parent b532168551
commit 182de0330f
15 changed files with 254 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/src/main/java/org/apollo/game/message/impl/SendFriendMessage.java
+9 -1
View File
@@ -27,7 +27,7 @@ public final class SendFriendMessage extends Message {
*/
public SendFriendMessage(String username, int world) {
this.username = username;
this.world = world == 0 ? 0 : world + 9;
this.world = world;
}
/**
@@ -48,4 +48,12 @@ public final class SendFriendMessage extends Message {
return world;
}
/**
* Gets the encoded world id to be sent to the client.
*
* @return The encoded world id.
*/
public int getEncodedWorld() {
return world == 0 ? 0 : world + 9;
}
}
game/src/main/java/org/apollo/game/release/r317/SendFriendMessageEncoder.java
+1 -1
View File
@@ -18,7 +18,7 @@ public final class SendFriendMessageEncoder extends MessageEncoder<SendFriendMes
public GamePacket encode(SendFriendMessage message) {
GamePacketBuilder builder = new GamePacketBuilder(50);
builder.put(DataType.LONG, NameUtil.encodeBase37(message.getUsername()));
builder.put(DataType.BYTE, message.getWorld());
builder.put(DataType.BYTE, message.getEncodedWorld());
return builder.toGamePacket();
}
game/src/main/java/org/apollo/game/release/r377/SendFriendMessageEncoder.java
+1 -1
View File
@@ -18,7 +18,7 @@ public final class SendFriendMessageEncoder extends MessageEncoder<SendFriendMes
public GamePacket encode(SendFriendMessage message) {
GamePacketBuilder builder = new GamePacketBuilder(78);
builder.put(DataType.LONG, NameUtil.encodeBase37(message.getUsername()));
builder.put(DataType.BYTE, message.getWorld());
builder.put(DataType.BYTE, message.getEncodedWorld());
return builder.toGamePacket();
}