Skip to content

Commit 5c85eb0

Browse files
committed
Improve teleport performance test with actual playerdata
1 parent 8a785d2 commit 5c85eb0

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

src/test/java/org/mvplugins/multiverse/inventories/handleshare/WorldChangeTest.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,4 @@ class WorldChangeTest : TestWithMockBukkit() {
4949

5050
Logging.info("Time taken: " + (System.nanoTime() - startTime) / 1000000 + "ms")
5151
}
52-
53-
@Test
54-
fun `World change performance with 50 players`() {
55-
server.setPlayers(50)
56-
val startTime = System.nanoTime()
57-
for (player in server.playerList.onlinePlayers) {
58-
server.getWorld("world3")?.let { player.teleport(it.spawnLocation) }
59-
}
60-
Logging.info("Time taken: " + (System.nanoTime() - startTime) / 1000000 + "ms")
61-
}
6252
}

src/test/java/org/mvplugins/multiverse/inventories/profile/FilePerformanceTest.kt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class FilePerformanceTest : TestWithMockBukkit() {
3737
CoreLogging.setDebugLevel(0);
3838
Logging.setDebugLevel(0)
3939
assertTrue(worldManager.createWorld(CreateWorldOptions.worldName("world")).isSuccess)
40+
assertTrue(worldManager.createWorld(CreateWorldOptions.worldName("world2")).isSuccess)
4041
}
4142

4243
@Test
@@ -140,4 +141,21 @@ class FilePerformanceTest : TestWithMockBukkit() {
140141
server.setPlayers(50)
141142
Logging.info("Time taken: " + (System.nanoTime() - startTime) / 1000000 + "ms")
142143
}
144+
145+
@Test
146+
fun `Teleport 50 players consecutively`() {
147+
for (i in 0..49) {
148+
writeResourceToConfigFile("/playerdata.json", "worlds/world2/Player$i.json")
149+
}
150+
server.setPlayers(50)
151+
val startTime = System.nanoTime()
152+
for (player in server.playerList.onlinePlayers) {
153+
server.getWorld("world2")?.let { player.teleport(it.spawnLocation) }
154+
}
155+
Logging.info("Time taken: " + (System.nanoTime() - startTime) / 1000000 + "ms")
156+
val cacheStats = profileDataSource.getCacheStats()
157+
for (cacheStat in cacheStats) {
158+
Logging.info(cacheStat.key + ": " + cacheStat.value.averageLoadPenalty() / 1000000 + "ms")
159+
}
160+
}
143161
}

src/test/resources/playerdata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"SURVIVAL":{"bedSpawnLocation":{"==":"org.bukkit.Location","world":"world","x":-40.0,"y":72.0,"z":0.0,"pitch":0.0,"yaw":0.0},"armorContents":{},"enderChestContents":{},"offHandItem":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"AIR","amount":0},"potions":[],"inventoryContents":{},"lastLocation":{"==":"org.bukkit.Location","world":"world","x":-39.5,"y":72.0,"z":0.5,"pitch":0.30000004,"yaw":-0.45000005},"stats":{"ex":"0.4980147","ma":"300","mhp":"20.0","fl":"13","el":"0","hp":"9.0","xp":"0.0","txp":"0","fd":"0.0","sa":"0.0","ft":"-20","ra":"300"}},"CREATIVE":{"armorContents":{},"stats":{"ex":"0.0","ma":"300","mhp":"20.0","fl":"20","el":"0","hp":"20.0","xp":"0.0","txp":"0","sa":"5.0","ft":"-20","fd":"0.0","ra":"300"},"enderChestContents":{},"potions":[],"offHandItem":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"AIR","amount":0},"inventoryContents":{"0":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_TORCH"},"1":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_BLOCK"},"2":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"COMPARATOR"},"3":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"LEVER"},"4":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"STONE_BUTTON"},"5":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE"},"6":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_BLOCK"}}}}
1+
{"SURVIVAL":{"inventoryContents":{"0":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_TORCH"},"1":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_BLOCK"},"2":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"COMPARATOR"},"3":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"LEVER"},"4":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"STONE_BUTTON"},"5":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE"},"8":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"REDSTONE_BLOCK"}},"lastLocation":{"==":"org.bukkit.Location","world":"world","x":-39.5,"y":72.0,"z":0.5,"pitch":0.0,"yaw":0.0},"armorContents":{},"potions":[],"bedSpawnLocation":{"==":"org.bukkit.Location","world":"world","x":-40.0,"y":72.0,"z":0.0,"pitch":0.0,"yaw":0.0},"enderChestContents":{},"offHandItem":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"AIR","amount":0},"stats":{"ex":"0.0","ma":"300","mhp":"20.0","fl":"20","el":"0","hp":"20.0","xp":"0.0","txp":"0","sa":"5.0","ft":"-20","fd":"0.0","ra":"300"}},"CREATIVE":{"inventoryContents":{"22":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"23":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"24":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"25":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"26":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"27":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"28":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"29":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"30":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"31":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"10":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"32":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"11":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"33":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"12":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND","amount":40},"34":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"13":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"35":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"14":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"36":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_BOOTS"},"15":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"37":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_LEGGINGS"},"16":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"38":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_CHESTPLATE"},"17":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"39":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_HELMET"},"18":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"19":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"0":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"END_STONE","amount":10},"1":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"BONE","amount":2},"2":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"ARROW"},"3":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"CRAFTING_TABLE","amount":63},"4":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"5":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"6":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"7":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"8":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"9":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"40":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"20":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"21":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"}},"lastLocation":{"==":"org.bukkit.Location","world":"world","x":-39.227095053544765,"y":72.0,"z":3.5331800520689565,"pitch":26.250015,"yaw":128.1001},"armorContents":{"0":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_BOOTS"},"1":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_LEGGINGS"},"2":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_CHESTPLATE"},"3":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"DIAMOND_HELMET"}},"potions":[],"bedSpawnLocation":{"==":"org.bukkit.Location","world":"world","x":-40.0,"y":72.0,"z":0.0,"pitch":0.0,"yaw":0.0},"enderChestContents":{},"offHandItem":{"==":"org.bukkit.inventory.ItemStack","v":4189,"type":"SHIELD"},"stats":{"ex":"1.0499994","ma":"300","mhp":"20.0","fl":"17","el":"0","hp":"3.3333358764648438","xp":"0.0","txp":"0","sa":"0.0","ft":"-20","fd":"0.0","ra":"300"}}}

0 commit comments

Comments
 (0)