2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Vinesweeper exploit

Browse source 
Fixed Vinesweeper server crash
This commit is contained in:
GregF 2024-05-31 09:33:32 +00:00 • committed by Ryan
parent aed73183d1
commit 66b1efdaa3
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Server/src/main/content/minigame/vinesweeper/Vinesweeper.kt
View file

@ -40,6 +40,7 @@ import core.game.interaction.InterfaceListener
import core.game.world.GameWorld import core.game.world.GameWorld
import core.game.world.GameWorld.ticks import core.game.world.GameWorld.ticks
import org.rs09.consts.* import org.rs09.consts.*
import kotlin.math.min
import org.rs09.consts.Graphics as Gfx import org.rs09.consts.Graphics as Gfx
import org.rs09.consts.Scenery as Sceneries import org.rs09.consts.Scenery as Sceneries
@ -369,7 +370,10 @@ class Vinesweeper : InteractionListener, InterfaceListener, MapArea {
} }
fun populateSeeds() { fun populateSeeds() {
while(SEED_LOCS.size < MAX_SEEDS) { val holes = countHoles()
val seeds = min(1.0 * MAX_SEEDS, holes * 0.13).toInt()
var tries = 0 // Prevent the while loop from crashing the server
while(SEED_LOCS.size < seeds && tries++ < 1000) {
val loc = VINESWEEPER_BORDERS.getRandomLoc() val loc = VINESWEEPER_BORDERS.getRandomLoc()
val scenery = getScenery(loc) val scenery = getScenery(loc)
if(scenery != null && HOLES.contains(scenery.id)) { if(scenery != null && HOLES.contains(scenery.id)) {
@ -378,9 +382,23 @@ class Vinesweeper : InteractionListener, InterfaceListener, MapArea {
} }
} }
fun faceHole(player: Player, hole: Scenery) { private fun countHoles(): Int {
val northEastX = VINESWEEPER_BORDERS.northEastX
val northEastY = VINESWEEPER_BORDERS.northEastY
val southWestX = VINESWEEPER_BORDERS.southWestX
val southWestY = VINESWEEPER_BORDERS.southWestY
var holeCount = 0
for (x in southWestX .. northEastX){
for (y in southWestY .. northEastY){
val scenery = getScenery(x, y, 0)
if(scenery != null && HOLES.contains(scenery.id)) {
holeCount++
}
}
}
return holeCount
} }
fun plantFlag(player: Player, hole: Scenery) { fun plantFlag(player: Player, hole: Scenery) {
if(player.inventory.remove(Item(Items.FLAG_12625, 1))) { if(player.inventory.remove(Item(Items.FLAG_12625, 1))) {
player.lock() player.lock()