diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03a4e5b25..8e7707361 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
# This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
- MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Xmx3g"
+ MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true -Xmx4g -Xms2g"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line.
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-fast --show-version"
diff --git a/Server/data/ObjectParser.xml b/Server/data/ObjectParser.xml
deleted file mode 100644
index bfd1c5167..000000000
--- a/Server/data/ObjectParser.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Server/data/botdata/botnames.txt b/Server/data/botdata/botnames.txt
index 22c5715a8..e16423b0c 100644
--- a/Server/data/botdata/botnames.txt
+++ b/Server/data/botdata/botnames.txt
@@ -1,43 +1,22 @@
--Kevo
-0 S O
-0 4 1 1
-0 4 7
-0 HBK 0
-0 Khan 0
-0 LM
+Kevo
0 Quest Ptz
0 Undead 532
0 hits
-0 s m a n
-0-0000000000
-00 zarour 00
-000eggs
-004 n
007 Double O
007Banshee
00eeeee58
00eeeeeHC
00oo00oo00z
010elpibexx0
-014ankh
-01690
017Lucas
01Ares
01eon
01ogre
-020893
024elyograG
02RS
02homestar
-031
-0315
-0416347345
-054
-055027584
05miller5
05venom04
-06 59
-0600
06sz
07 Account
07 Adept
@@ -50,11 +29,9 @@
07 Officer
07 Rz
07 Sicario
-07 T Bone
07 iron
07 kiero X
07 nice jake
-070623
07Ashley
07Ben
07Geno
@@ -66,18 +43,10 @@
07Rockysbudy
07coco
07guthix07
-07wan
-080
-0800
-0800952449
-0837
-09
-0920
09Ash
09Ashley
09Ato09
09Chris
-09Dans
09Paul
09Reaper
09Rhys
@@ -86,42 +55,29 @@
09TroyScape
09milo456
09scaping
-09wan
-0BAMA
0Behind0You0
-0CdanC0
0G
0GCore
0Giesel42O
-0IIll0llIIII
-0JL
0Joker0
0KAT
-0LKI
0MEGA PVM
0MG ST3PSIS
-0MW2PVM
0Manbearpig0
-0MrJ
0PC
0Pwnseason
0S Iluvatar
0SFX
0Tempest0
-0WEK
0X010
0_BADASS_0
0anabanthis0
-0bD0G
0bankspace
0bby
-0bby Man
0belix
0bscure0ne
0ctopus
-0dds r u win
0desza
-0dexy
0dyssey
0ff Task
0ffline
@@ -137,8 +93,6 @@
0im2old4this
0inke
0k
-0l
-0l m
0ld Mate
0leaguespace
0li
@@ -162,11 +116,9 @@
0neski
0netruememe
0niichan
-0njon
0nlyClouds
0nmy
0ops
-0oqs
0pSe
0pen
0pen Al
@@ -177,13 +129,9 @@
0rl
0rnstein
0rphaned
-0samaBdabbin
-0sc4r
-0smasher0
0so
0ssimpwner
0syb
-0t
0taku
0taylor
0verHyped
@@ -204,35 +152,15 @@
0xocube
0xp Fail
0xygen
-1
-1 0 1 0
-1 1 4
-1 2 2
-1 337
-1 3s
-1 4 11
-1 54
-1 9 7
-1 A M O R
-1 A N D 1
1 Account
-1 Corin 6 9
-1 DC
-1 Flicki Boi
1 Free Ryde
1 Ham
1 K0 Is Back
1 Line
1 Lion Tell
-1 P P 1
1 Percent
-1 Waffle
1 and only
-1 is ln of e
-1 kc 1 pet
-1 parhaista
-1 s t Blood
-1-800DILLDOE
+1st Blood
1-GrayStone
10 Four
100 Duke
@@ -241,57 +169,26 @@
1000 Ways
10000Fists
1000PingOnly
-100Cl
100Grabb
-100g
100kyews
100m gp
100xcoin
-101000101010
-1017Trev
-101e
101evil101
101rootbeer
-104512
-105
-107M
-1085
-1099s
-10Hz
-10R80
-10b
-10cc
-10lachs
10mm mafia
10th Reaper
10v10
10v10v
10v10v10v
10x Brew
-1101953119
-1111
-11111111111d
111fishkite1
112OceanAve
-116
-116 123
-1183kenny
-118s
11inchlimp
-11l1
-12
-12 49
12 XP
12 hours
-120u
-1212ajs2
123 Zeus
-123456205
123Four
123bear5
-123tseemijni
-1272172
-1288
12bar
12bar_ty
12blackeagle
@@ -299,24 +196,6 @@
12earlycob
12in
12millionGP
-12oss
-12oz
-12th
-13 37
-13 Daas
-1300
-130SS
-130rk
-1312AFCA
-1313
-131kg
-1337 af
-1337Trevor
-1350
-138hans
-13D
-13LACK0N3
-13O
13alerion
13ayek
13ehh
@@ -328,98 +207,44 @@
13purecs
13ruce
13th Witness
-14 wides
-1400
-14060M
-144
-1441
-144forever
-1453 FSM
-149122089147
-14Fre-e
-14GT
-14Words
15 min Break
150 kilos
1520sedgwick
15b name
-15mg
-16 Fly Tell
+16 FlyTell
16 Fps
-1602
16bumpysnow
-16lB
-16le
-17 76
-170 IQ
-17222
-1780
-17Kc
-17_FLHXS
17rune2277
18 Or Older
18 Points
18 girlll
-18-06-2022 x
-1800BetsOff
-1802M
-180555
-181
-1817
-1827
-1845
-184910381412
-187
-187 781
-1877
187PIGMORGUE
187er
-1889
18cast1935
-18hr
18killz
-18s
19 KAPLAN 05
-19088ml
-1942
-1948
-199
-1992
-1994
-19O7
19edgebee
19puxx
-1AB
1After909
1Alfa
-1Ali1Plane
-1BGP
-1Bio
1Buck1Love
-1C2R
1C3 W4RR10R
1CuteBot
-1Fbs
-1G1D
1GramIronMan
1Hit2Lum
1Hunnid
-1I1I1IIll1l
1InchWalrus
1Iron Reborn
1Kyle
1Lank
1ManGangBang
1Mayze
-1NANO
-1NU
1Nikolai
1Nut Dude
1O1Barz
1Ogp
1P Game
1Parthannax2
-1RlE
1ST KC
1Shadow9Fist
1Shark
@@ -431,7 +256,6 @@
1TickShit
1Unforgiven8
1_BLEED_BLUE
-1ars
1badprogram
1bankingnoob
1blackhawk17
@@ -450,8 +274,6 @@
1imp1jar
1isa
1itemtbow
-1jbone
-1john
1k no zik
1kDuramax
1kMaster QXD
@@ -469,11 +291,9 @@
1nVaSioN
1ndy
1ne life
-1nfiniti
1nsane str5
1nv1s
1nvercargill
-1o 8
1ocation
1please
1powerhydra
@@ -484,46 +304,31 @@
1st ed mint
1st son
1stHCwasPKED
-1stlrfan
1stnoob7
1t8w
1tapaturma
1tickspecwep
1trueMortyy
1ucif3ro
-1v1d a sedan
1w1lll0se
1wayEscape
-1wwdwd2e21ed
1yfe
-1zet
-2 0 1 4
2 1Savage
-2 2 7 7
-2 2 8 9
-2 3 7 5
-2 9
2 Big tities
-2 Brothers
2 Much Tuna
-2 P A C
2 Rich 4 Dis
2 Silent 540
2 Smooth
2 ball cane
2 funny bro
2 grls 1 Jad
-2 h p
-2 in
+2 hp
2 kups
-2 lN
2 more min
20 20 vision
20 Agi irl
20 On Pump 3
-200
200 Cook
-2000
2001Arwen
2006nope
2007scape
@@ -536,94 +341,35 @@
200mslay1day
2011Turmoil
2013 Rt
-20130406655
-20136
2027Parzival
-202o2
-204 Wootang
205alphago
-208
-209th
-20Four
-20I0
-20JuanSavag3
-20ms
-21 5
21 Average
21 Musketeer
21 Savage
2137 gp
-215O
-2173
-21JJ
21SavageX2C
21unit
-22 69
-22 Geese
-22 Gz
-22 darnoc 22
-22 day fury
-220mg
-226559
-227 7
-2277
2277 Beast
2277 Soon TM
2277MaybeNvr
-2277kg
-22O5
-22X7
22btc
22harry
22mario
22whitewolf
-23 x 3
232o2oo
-234071973416
-23463564
-235iii6i666i
-2376Total
-2376ed
-23847239571
-23CD
-23I
23coalcare
24 Hour
-24000
-241
-241196
-2424
-245
-247 365
-2488
-24YO
-24l7
-24w
-25 S
25simulator
-26 th
260sheepdog
-265344626546
-26ll98
26pandas
26th
-27 5
-27 M
-271MPN
-27ml
-2841280
28BagsOfSalt
28goldpieces
-290x
-29384652
-2996
29Pons30
29enchant821
29robdead
2B Nier
2Broke4Coke
-2C-T-2
-2D E F2
2D pantsut
2Edgy4Meme
2Far
@@ -634,21 +380,11 @@
2Goblins1Jug
2Guys1Wyvern
2Guys1dds
-2I40
2InchLift
2InchPnisher
-2JZ GTE
-2JZ Soup
-2JZ-GTE Mk4
2Jerry
2Lit
-2M0X1
-2MIN
-2Men
2MinNoodles
-2O xp
-2O07
-2OO7
2QC
2Rare2Die
2Secs
@@ -675,14 +411,12 @@
2girls1Tbow
2girls1bed
2girls1troll
-2girlz1jbird
2gurls1tick
2h ur azzzzz
2hopp
2hot2touch
2hot2touch2
2hs
-2id
2kav
2late2team
2logx
@@ -696,120 +430,61 @@
2pacs
2plush
2sm0keyyyyyy
-2steps
-2th7
2tickin
2tti
-2two77
-2uBz
-2ual
-2ugi
2woke
-2x92is99
-2ze
2zick1zussy
-3 Hit V
-3 5 P
-3 50
-3 77
3 Moons
-3 S I X E S
+3 SIXES
3 SwordStyle
-3 T C
-3 arcanes ty
+3 arcanes
3 me0
3-age
30 yo b00mer
300m MPS
-3019
-30FF
30SHOTFOCUS
-30XY
30thNovember
-30zl
-311s
-3155
-315lbs
315squatreps
-3160
316Austin
32 kay
-320m
33 Dust Cat
-335K
-33jf
-33zero2
-3400
-341all
-34241245321
-345138
-34HL6432G6L2
-34T
-34rj394thgro
-351329
35ankoumoon
35cm bicep
360 Labels
360backhand
365 day
369x
-36ACT
36answersay
-379
-37Kg
-37kg
-381N
38CoolestMan
38drivelift
39 PETS
3BigDoobie
3D AnimeTits
3D Dorito
-3E8
-3G
-3III
-3L1QZaD
3LetterName
3Miller3
3TicYaMum
3TickEat
3Ticks
3WordName
-3a B0ng
-3aly
-3amf
3arbeed
3ash
3awe
-3b
3bay
-3bobyshmurda
-3d age boots
-3d354
-3dderino
3erzerk
3h scimitar
-3ibal0e9
3inchsoft
-3ioc
3iron5u
-3km
3lPatron
3lack 3litz
3lilbirbs
-3lit3
3liteSupreme
3lven
3lyrie
3lys
-3niZ
-3nosedmonkey
-3nps
-3oh5
3pic
3ragesave
3rd Age Ryan
-3rd Age THC
3rd Age Toes
3rd Age Wife
3rd Hunter
@@ -819,38 +494,21 @@
3rdAgeHunt
3rdAgeSlayer
3rdMistake
-3sd
-3sl
+3d age boots
3stripe
-3uck
-3uzi
-3verD3ad
3vil
3vil Giraffe
3vil Lawyer
-3we
3x3i
3xDestroyer
3xtra-1arge
3yes
-3zR
-3zi
4 Bros Info
4 Man Nex
4 inch demon
4 inches now
-40 IQ
-400L
-400s
-403 b
-40699 Crabs
-40Atk
-40ms
-40oz
-412087542131
413 JokeR
416MiIf Jade
-41O
42 Mime 2462
42 Reasons
42 skankhunt
@@ -868,27 +526,11 @@
420licious
420michael13
420tarmslyng
-42342343342
42Def
-42O42O
-42nd
432andone
43technetium
-44 bot
-4400
-44444444444
45 fail
-4500c
-4564
-457
45smith2345
-478k
-47an
-47th
-48H
-48hour
-49 r
-492117837813
49forcerage
4ALLYaYa03
4D Entity
@@ -899,8 +541,6 @@
4K MrKrabs
4KT Youngboy
4Kath
-4L O K O
-4LDO
4LeafCIover
4Lt Goon Bag
4MoistScoops
@@ -915,15 +555,12 @@
4are
4asphalt4
4biddin3
-4cof
-4dan2
4dapigs
4dosemonster
4ever
4everdry
4got2pull0ut
4gottenvoid
-4hQ
4hit pl0x
4holyhydra
4iend
@@ -937,63 +574,32 @@
4rKsTon3
4sen
4th lesson
-4th8
-4the
4themininoob
4thunderbolt
4ur Elise
-4werty4
-5 56
-5 Nine
-5 Oh
-5 mil
-5 ms
5-Bet Fold
50 DKP Minus
500 BJ
-5000men4
-505
50Dkp_Minus
50TintenUwMa
50bitsnka
-510
51Highlander
51xp
528racklover
-5304
530pm
53R10U5
53m0g
54 Slayer
-548
-55mg
-562
-5639
-56667
-56771910
-56O
-570215
-5771
57tallfred
57wraith2076
-5876
-58th
-59OG
5ADx
5Aces
-5BY5
5G fries
5GCovidTower
5H4NKS
5IRLOIN
-5Id3Track
-5M3H
-5M9SNH31KAOI
-5NAX
-5OP
5Orudis5
5UBLlME
-5a9
5alood
5alve
5ammito
@@ -1001,69 +607,28 @@
5eekingdeath
5eizures
5g Internet
-5gum
5harp5hoota
-5hauny
-5hayWh1te
5head
5inch Floppy
-5is
-5j5
5kc Zulrah
-5l9
-5lNS
5lap
5nis
5parrow
5quid
-5st
-5t h
5th Blessing
5th hcim LUL
-5trm
-5wan
5wattia
-5x3
-5xr2
-6 57
6 9buttholes
6 Donuts
6 Drive Fox
-6 Foot 5
-6 I X GOD
-6 M
6 Mil
6 Qp
-600 Years
-605
-60min is 1hr
-617
-61V
-6264
-629fm
62steeplist
-6384
-647
-64DD
-64th
-6535
-6620
-666 317
-666 J
-666 is leet
-666Ds
-666Duuvel666
666drkwizard
66Cute
66sick
-675
-67M
-67jj6j7
68 savage
-6822ii
68pickleman
-69 L OR D 69
-6942O
69KolaOlli73
69Skrrt420
69bbygurl
@@ -1072,17 +637,10 @@
6ESkarmory
6LACKY
6PaperJoint
-6R6
6T9sofine
-6TMG
6Tilbud
-6UGG
6cansOfBeer
6cythe
-6dr3w9
-6e
-6enny
-6ess
6et Schwifty
6h Logout
6in9
@@ -1090,72 +648,25 @@
6ixty
6ixx
6jadkiller
-6km
6lb brownie
-6mat
-6ong
-6p8o6
6pathsofpein
-6qp
6shooter
6uapo
-6uh
6utt9lug
-6y6y6y2
-7 7 MAFIA
-7 Curry
7 DeadlySins
-7 Fat Drake
-7 Of Nine
-7 Trouts
-7 pets chimp
-7 seconds
-7042
70Point1 lol
70rangeboy
-70to120
-710 710 710
-716
-718m
-71rc
-72005sc
-73 and Kree
-734590325839
-737
73Head
73HoundKey
-73gp
-742617OOOO27
74ChaosLTUU
75 IQ
-76frozen44
-76ms
-7738
777slayer777
-77Dunamis77
77Stingray
-77ms
-782
-784162
79giantfoot
-7AYL0R
-7D9
7Esconar7
7Ethereal
-7F9
-7GB
-7God
-7H3
-7J4FXEL7YFW5
-7Lazy7
-7RAC
-7T
-7TF
7Vick
7Viggie
-7ZP
-7abibi
-7amowdahli
7aq
7asty
7ate9
@@ -1165,20 +676,13 @@
7ckng Mad
7claudia7
7crypto7
-7emo
-7emp
7emptest
7fisherdog
7havage
-7min
-7mins
-7mni
-7om
7ourney
7out
7rad3
7raphouse
-7rev
7ridley
7scaryfire
7th Chamber
@@ -1186,104 +690,45 @@
7uP joAo
7wizard10
7xshadowx7
-8 1 O
-8 3B
-8 Sue Build
-8 alien 8
-8 bit bling
-8 oh 8
8008tator
808Southside
80leavefox
82 Sue Say
-8282
831pride
-832arba
-8485
-849
84Bandit
-85 N
-8502
-852K
-858
-85U
-85dakota85
-88 Odd Wand
-8800
-8885
-88gg
-89devoid1329
8ASS
8BootRaw6220
-8ElMandinga8
-8J8
-8O8O8O8O8O8O
8ass
8balknowsall
8balled
8eauty
8h of sleep
8ind
-8l0wm3
-8lackMamba24
8loodrune
8lue Phat
8owser
8qxkf02v
8tail
8uD
-8yrs
-9 9 Problems
-9 B 0
-9 DUIS
-9 Tick Brain
-9 mb
+99 Problems
900mexp
901Grizzlies
-90804
-9092514
90tegguy
-91
91 Tin Idea
911_Nate
-91414
91CAL
91flip
92 way there
920 Bdops
-9227
-9297
-92t
92times2is99
-94 xp
94AR BTW
95EliasAw
-95LH
-95p7
96 WINDSTAR
-9687
96fastfrog
-97DEF
97ccman97
-97fsh
-98 BEDARD
-98 Civic
-982
-98Bn
98max1
-99 Doobies
-99 Grill
-99 Grinding
-99 Mage
-99 Rats
-99 StaKe LvL
-99 Steeze
-99 oz
-99 rwt
991atatime
-9991499
99BnkStnding
-99Juuling
99Lives
99S2HP
99Scents
@@ -1294,40 +739,24 @@
99_Maxed
99bottin
99charming
-99hh
99moretimes
-99ox
99problems4
-99ss
99sweatlvl
-99wc500m
9Bar
9Barr
-9CX
9D9Skillzz
9Dimensional
9GAG Reflex
-9JR
9KL00AZIIZ9K
-9O 9
9PetsSoFar
-9T3
9TY9_Sailing
-9UNIT
9cansRavioli
-9ieman
9inchStepBro
-9mm ko
9mmlesah
-9ne
-9ond
9till5slave
9ussy
9yearoldpops
A 2 The Aron
-A 3
-A 45
-A 7 F O L D
A Articuno
A Bad IGN
A Bad Meme
@@ -1346,15 +775,12 @@ A Cityzen
A Claptrap
A Classy Boy
A Crazy Cook
-A Crisp Sock
-A Curry
A Cute Snail
A Dreamer
A Drunk Beer
-A Du Ma
A F K Scape
A F KING
-A F M Scape
+A F Scape
A Fat Deer
A Fat Pike
A Fat Swede
@@ -1364,20 +790,10 @@ A Godsword
A H Fire
A Half Fool
A Hofasho
-A I D E N
-A I I e n
-A II D
A Iron Yoshi
-A J
-A JJug
A Jack O Lit
A Jug
A Kimura
-A L 3 X
-A L C A P WN
-A L E K S
-A L I S H A
-A L T
A Lava Lamp
A LifeTime
A Lilypad
@@ -1407,8 +823,6 @@ A Pot Head
A Psy
A Quest God
A Quickie
-A R H
-A R Z
A Raccoon
A Random 4nr
A Real Bamf
@@ -1437,64 +851,44 @@ A Wise Sloth
A X Y S
A Yang
A Yep
-A Zee
-A Zeer
A Zoo Keeper
-A Zuk
-A Zuzakini
A aron
A bit north
A broke 126
A capybara
A cclimation
-A d e b y
+A deby
A dam
A damm
A dammmm
-A e d o
-A e s i r
+A edo
+A esir
A f r a i d
-A gg
-A lba
-A ll F
A llan
A llstar
A ltar
A m a nd a
A n d re
-A nz
A rdy
A rmin
A rmoa
A rrow
A stoner guy
-A to teh Jay
-A ug
A y s a
A z k e n
A z t e r
A-Chronic
A-F-Kaveman
-A123
A13X
-A15
A1KMAN
A1nz00alGown
A1rhook
-A2
-A22Y
A47 Soldier
-A543
-A7MED
-A84
-AAA GG
AAAAAFK
AAAAAddy
AAIGHT
AAsamba
AB Dash
-AB84
-ABEC
ABG Huntr
ABILITEETTI
ABearCat
@@ -1502,8 +896,6 @@ ABlazys97
ABlueShirt
AC Dicing
AC TEMP IQ
-AC0T
-ACDC
ACatGirl uwu
AColdBeer
AComp
@@ -1540,11 +932,8 @@ AFKspiracy
AFTW
AFX64
AFrickinLion
-AGIT8
-AGP3
AGRONOMlST
AGSpec
-AGWA
AGlassOfH2O
AGorski
AH Energy
@@ -1556,7 +945,6 @@ AHarmlesKitn
AHlager
AHriMTaLeZ
AI Fighter
-AI0
AII 99
AIchemyz
AIecko
@@ -1566,26 +954,14 @@ AIixs
AIlByMyself
AIm23ARDesti
AIways sm1le
-AJ R
-AJ Skills
-AJ4J
-AJTracey
-AJ_24
-AJisHere93
-AJsk
AK Alpha
AK Sam
-AK47
-AK4LF
-AK5C
AKI-47
AKK1E
-AKM
AKSpring
AKinkyMonkey
AL-Trojans
AL3CX
-AL7
ALBlNO
ALEXppresso
ALLCAPS
@@ -1602,18 +978,14 @@ ALonelyKurt
ALonelySpoon
ALonelyTaco
ALv3Magikarp
-AMAWM
AMC Millions
-AMD352
AMDOSRSIRON2
AMGS65
AMRSY
-AMST
AN07HER
AN0NYM0OOOUS
AN1MAL1ST1SK
ANDERDAPLUG
-ANDR3
ANDREVVTATE
ANDROlD 18
ANGL0 SAX0N
@@ -1630,14 +1002,8 @@ AOT GOAT
APC L000000L
APTZ27
APrince
-AQ COCUGU
-AQMD
-AQUAMARROCKZ
-AR Brah
AR Fifteen
AR15ONA
-AR1F
-AR53
ARCANO RS
ARCHER
ARCHIT3CTS
@@ -1670,7 +1036,6 @@ ATastyPastry
ATurboVirgin
AU6URY
AUD1O
-AURl
AUSLANDER
AUSTlN
AUTOart
@@ -1689,8 +1054,6 @@ AXL gun ROSE
AYRI DMM
AZER
AZNPanda
-A_G_4
-A_Wuh
AaaBiiCee
Aaalmost
Aadalyn
@@ -1712,35 +1075,12 @@ Aaron Btw
Aaron Quiz
Aaron Samuel
Aaron11700
-AaronJMLP
AaronPVM
-Aarsworm
-Aarti
-Aary
-Aaryn
-AashUnce
Aastradsen
AatroxLife
Aauburn
AavikonGaara
-Aayraz
-AbInito
-Abaay
-Abacraumbii
-Abaiz
-Abaker
-Abaqus
Abariel
-Abbas Elect
-Abbey
-Abbey Ruins
-Abbo baker
-Abbyscimmy
-Abc easy as
-Abdallah6
-Abdirahman
-Abe lnnkon
-Abe numse
AbeTheHobo
Abengers
Abernasty
@@ -1748,7 +1088,6 @@ AbiChillii
Abide
Abido
Abigayyl
-Abismaalinen
Abito
Abiuro
Ablazin
@@ -1796,11 +1135,6 @@ Abstractable
AbsurdGreek
Absurdly Gay
Absynthial
-Abu Chungus
-Abu Salih
-Abuk
-Abulssoni
-Abuv
Abyission
AbysmalGrind
Abyss Laps
@@ -1850,7 +1184,6 @@ Aces
Aces x3
Acesuke
Acesupersoak
-Acetazolamid
Acha9
Achaeos
Ache
@@ -1862,7 +1195,6 @@ Achilles Low
Achilles XXI
AchillesFist
Acholight
-Achuu11
Acid
Acid Cat420
Acid Christ
@@ -1877,9 +1209,7 @@ AcidHouse
Acide
Acidic
Acidylia
-Acir
Ack Varmland
-Acke
AckeSSBM
Ackman67
Acko
@@ -2071,11 +1401,6 @@ Aeugh
Aev
Aeyriex
Aezolix
-Aff it
-Affaires
-Affan Khan
-Affect
-Affectie
Affidra
Affinivax
Affirmed
@@ -2101,26 +1426,6 @@ Afkin
Afkoelen
Afkstar
Afkwarrio6
-Aflamed
-Afnacho1
-Afonso
-Afperser
-Afrecan
-AfricaSavior
-Africagamer1
-AfricanMelon
-Afrie
-Afrikka
-Afriquee
-Afro
-Afro Deagle
-AfroFishh
-AfroShay
-Afrojofe
-Afroman
-Afromann
-Afromouse87
-Afrothunder
Aft3rmath
After Dark
After3Scoops
@@ -2204,10 +1509,6 @@ Ahriah
Ahrim Job420
Ahrou
Ahvexx
-Ai Haibara
-Ai activated
-Ai u
-AiMienOortje
AiNebesvaik
AiXiao
Aiai8
@@ -2255,11 +1556,6 @@ Airstone
Airstrike
Airstrikes
Airwalk
-Airwipp
-Aishi owo
-Aisyah
-Aivery
-Aiwe
Aixaa
Aixleft
Aiyaaaa
@@ -2267,21 +1563,6 @@ Aiyzer
Aizor
Aizzz
Aj Blitz
-Ajamian
-Ajarn
-Ajaxius
-Ajdj
-Ajeh
-Ajeti
-Ajikk
-Ajinz
-Ajt141
-Ajushox
-Ajuus
-Ajx
-Ak 4854
-Ak5u
-Aka God
AkaSpecs
Akadian
Akagi
@@ -2292,13 +1573,6 @@ AkaseAkari
Akasha
Akashy
Akatsuki
-Akaza
-Akduman
-Akeno
-Akhasa
-Akhavan
-Akhotha
-Akiha
Akihiko Main
Akilled
Akimbo Gmaul
@@ -2332,17 +1606,6 @@ Akustic
Akvarij
Akyba
Akyle
-Al Go Rhythm
-Al e x x
-Al ex G
-Al-Kimiya
-AlCaponee
-AlFromOhio
-AlIigator
-AlMusallam95
-Alabandus
-Alabarce
-Aladfar
Alak4zam
Alakazoom
Alakazzaror
@@ -2371,9 +1634,6 @@ Albertttt
AlbiBambi
Albin0z
Albinos10
-AlboBloodZ
-Alboy
-AlbusTheDood
Albuun
Alc1
Alcadeias
@@ -2464,27 +1724,6 @@ Alexx2G
Alexxandraa
AlexxisTexas
Alexzilla
-Alf11
-AlfaAleksi
-AlfaQ
-Alfahane
-Alfahanne
-Alfication
-Alfie 96
-Alfonga
-Alfonso
-AlfonsoKhan
-AlfredTB
-Alfrid
-Alfuh
-Algiebeer
-Alharbi
-Alhyrr
-Ali Shuffle
-AliThePvmer
-Alibaba
-Alicander
-Alicc
Alice
Alice x
AliceOMalice
@@ -2498,7 +1737,6 @@ AlienVoucher
Alienmage
Aliens
Aliii33
-Alijr
AliksOh
Alioman
AlistarTb21
@@ -2628,21 +1866,10 @@ Alrite
Alry
Alsatian
Alsatians
-Also
-Also Jack
-Also Luci
-Also Lucky
-Also Nexxtar
-Also Noexi
-Also Schlak
-Also kawkky
-AlsoAlso
AlsoRabbit
Alst
Alston
Alt Ctrl
-Alt G boys
-Alt Juana
Alt Redshok
Alt prepot
Alt3rbridg3
@@ -2698,12 +1925,6 @@ Alwin S
Alxs
Alyks
Alysanne
-Alyv
-Alzad
-Alzuraak
-Alzz
-Am eer
-Am ity
Am ln Danger
AmCatWhatDo
Ama zon
@@ -2751,22 +1972,6 @@ Amend
Amenity
Ameno l
Americlaps
-AmiableDingo
-Amibis
-Amida
-Amigeau
-Amigo
-Amigos
-Amillie
-Amin
-Amir Psycho
-Amis
-Amitwin
-Amityz
-AmixBeast
-Amjad
-Amjar
-Amka0s
Amkings
Amlodipinee
Ammastian
@@ -2852,8 +2057,6 @@ Ancientz pal
Ancitif
Ancona
Ancow
-And e
-And r ew
AndSo
AndYetISmile
Andardenn
@@ -2870,7 +2073,6 @@ Andiamo98
Andipyrus
Andirath
Anditre
-Andj
Andoyen
Andrade149
AndreasBL5
@@ -2957,15 +2159,6 @@ AngryNachos
AngryPickle
AngryScape
AngryWizard
-Angsti
-AngusM
-AnhTaDuong
-Anhedoniaa
-Anid
-Anida Hanjab
-Anidien
-Anieli
-Aniheyu
Anim
Anima
Animal
@@ -3131,15 +2324,7 @@ Anzie
Anzied
Anzu
Anzypoo
-AoA Jammer
-AobaJohsai
-Aog
-Aoh
-Aohc
-Aohu
Aoi Tetsu
-Aokijahr
-Aokijii
AonEne
Aonyx
AoooA
@@ -3150,16 +2335,11 @@ Aozaa
Ap0logy
Ap0phis
Ap3x
-Ap870
-ApRoMn
-Apaat
-Apaatje
Apache
Apache30
Aparlo
ApartAbyss
Apathetik
-ApdoJ
Apdomine
Ape Cape
Ape Dos Mil
@@ -3169,7 +2349,6 @@ ApetimusPrym
Apex
Apex Pro
Apex-scaper
-ApexGT
Apexflashy
Apexist
Apgujeong
@@ -3495,14 +2674,6 @@ Arrowtower
Ars Nova
Arsaydar
Arsenals
-Arsene rar
-Arsenic
-ArsenicEyes
-Arsenn
-Arshal
-Arsi
-Arslen
-Arson
ArsonScape
Arst
Arstan Selmy
@@ -3767,17 +2938,13 @@ Atvinnulaus
Atylos
Atza
Au 0srs
-Au 1
-Au Bar
Au Barrett
Au Joel
Au Shooty
-Au92
AuRoyce
AuStarZ
Aubrey
Aubrey UIM
-AubsG
Auburn Lax
Aubzzz
Auclaw
@@ -3800,8 +2967,6 @@ August
AugustAmes
Augustiner16
Augutis
-Auhdy
-Auja3
AuksoAlt
Aulono
Aumoki
@@ -3828,7 +2993,6 @@ Aurtle
AurumFoxfire
Auryn
Aus
-Aus 2277
Aus Shizam
AusBruto
AusGram
@@ -4005,9 +3169,6 @@ Ayenull
Ayetg
Ayfi
Aylia
-Aylward
-Ayman
-Ayo4Yayo
AyoSteeze
Ayoe
Ayonikz
@@ -4016,41 +3177,11 @@ Ayri
Ayrton
Aysuu
Ayveros
-Ayy Nakana
-Ayy bae bae
-Ayy q p
-Ayyye
-Ayyyon
-Ayzo
-Az PVM
-Aza zel
-Azad
-Azad Kashmir
-Azala
-Azami
-Azandari
Azathor
Azathoth26
Azathrir
Azazel OSRS
Azeenil
-Azemu
-Azerma
-Azez
-Azimut
-Azimuthaal
-Aziz
-Aziz7
-Azkaton
-Azken
-Azkybot
-Azlo
-Azmataz
-Aznbabe
-Aznmixboy
-Azom
-AzorAhaiBTW
-Azotize
Azoxy
Azpa
AzraelReaper
@@ -4082,69 +3213,8 @@ Azzanadraa
Azzax
Azzgarnia
Azzz
-B 0 B S
-B 0 S S
-B 0 U J E E
-B 3R
-B 58
-B A F F E Y
-B A MF
-B A U W S
-B B Bouncy
-B C 2
-B C M
-B CA
-B D Y
-B E E G
-B E R T A
-B E R t I 3
-B ELA
-B Gates
-B Gonkeybron
-B I G G L E
-B I R T
-B Ian
-B J O R N
-B L 4 N K
-B L A D E Z
-B L A N E
-B L A Y E D
-B L ANK
-B L I X T
-B Milesy
-B Minor
-B O G S
-B O O T H
-B O Y E A
-B R A l N
-B R II A N
-B R l C E
-B S
-B SlDE
-B T J
-B Victor B
-B W 1
-B W A K
-B aylor
-B aze
-B ecky
-B eeez
-B iggles
-B la z e
-B las
-B r a g g
-B r eezy
-B rads
-B raes i
-B ruised Lee
-B u bs
-B ug
-B un
-B utt
-B w
-B-0-SS-M-A-N
-B-Dollaz
-B-Lal
+B0BS
+B0SS
B00 KAW KEY
B00Lici0us
B00MERAT3R
@@ -4187,14 +3257,7 @@ B1gTTgothGF
B1gd0wg
B1ink
B1mboBambi
-B1zrme
-B2AD
-B2F
-B2J3
B2bZeroSpecs
-B2rad
-B3A5T
-B3CK
B3NJAMOON
B3NT D0ver
B3TTERLUCK
@@ -4202,15 +3265,6 @@ B3Y0ND
B3njamima
B3njamin
B3nny Blanco
-B46
-B4RR
-B4S
-B4llista
-B6a
-B6i
-B70
-B747B
-B8 H8ER
BACKURBOI
BACONisgd4me
BADASS
@@ -4229,17 +3283,12 @@ BASEDQwert
BATATUNGA
BATH0RY
BAYLlFE
-BBBBBONKA
-BBGL
-BBK
BBKwenie
BBL RIZZY
BBQs
BBW Pizza
BBarnzeyy
BBeepLettuce
-BBoys Father
-BCBDestroyer
BCC YT
BCDOJRP
BCK CigButts
@@ -4255,7 +3304,6 @@ BEEA
BEG0N
BEG0NE
BEINGMAXDSUX
-BELSJ
BEMBOU
BEST
BET5
@@ -4271,7 +3319,6 @@ BIGD05
BIGDROPHUNTR
BIGFERGLOAD
BIGHEADSMASH
-BIGJP
BIGMINK
BIGSITUATI0N
BIKlIllIlIIE
@@ -4279,14 +3326,11 @@ BILR0Y
BIOATED
BIRD SHlT
BIRP
-BIRWAAA
BIS Monster
BIaded
BIadet
BIapa
BIood Prince
-BJ Applegate
-BJ M
BJPlaysRS
BKBB
BKK
@@ -4298,7 +3342,6 @@ BLACK DOG NI
BLASE
BLGesus
BLICKYSTIFFI
-BLOBi WRX
BLOOD
BLUEPIZZAMAN
BLXCKPINK
@@ -4308,10 +3351,6 @@ BMEUR
BMooldijk
BMrgn
BO0MERSO0NER
-BOA Liger
-BOBGIGALUCKY
-BOBYAHMDGECI
-BOER KAMIEL
BOGOBoneless
BOL0CKS
BOLSOONARO
@@ -4329,11 +3368,8 @@ BOlNEXTDOOR
BPNS Hawk
BPTheIronOne
BPrimitive
-BR0 BRO
BR00KES
BR0CE
-BR0ER
-BR0THERS
BR3AKABLE
BRA71L
BRACULA
@@ -4345,7 +3381,6 @@ BRUTAL
BRabbit25
BRlOCHE
BSB Howie
-BSNR
BST Steve
BSickler
BSven-B
@@ -4356,13 +3391,9 @@ BTW Beirre
BTW idgaf
BTW vs RNG
BTWSaberlion
-BTWsanta
BU1MER
-BUHLL
-BUILD
BUILD PONYS
BULLlSH
-BUNDHA
BUNStheGOD
BUR13D AL1VE
BURYT0MORROW
@@ -4371,33 +3402,11 @@ BUTTB0NERED
BUTTCOlN
BV Martyr
BWheatZ
-BYEq
-BYOBOOZE114
-Ba1i
-Ba5b0y
-Ba6y
-Ba77erY
-Baa m
-Baaaats
-Baal157
-BaalZvuv
Baals
Baalthas
Baamf
Baami
Baandos
-Baarb Lahey
-Baas
-Baba
-Baba Booey9
-Baba Borgar
-BabaLovesKos
-BabaSlaaf
-BabaSleep
-BabaTarzan
-Babafasa
-Babayaga-9
-Babayaga2121
Baberrandrid
Babica Mraz
Babiez
@@ -4519,26 +3528,11 @@ Baekah
Bag it
Bag of Yay
BagFryLife
-Bagadigi
-Bagan
-Bageera
-BagelSpanker
-Bagels
-Baggyshaw
-Baghdad
-Baginga
-Bagis
Bagokk
Bags
Bags n Beer
Bagsnacks
Bagz
-BahRitTanEe4
-BahamutLimit
-Bahn
-Bahnzeen
-Bahp
-Bai Ningyang
Baib
Bail Jait
Baileys
@@ -4551,22 +3545,6 @@ BainoLad
Bainz
Bairac
Baites
-Baja Baja
-Bajan
-Bajart
-Bajcolado
-Bajela
-Bajere
-Bajhole
-Bajista
-Bajji
-Bajkami
-Bajsanus
-Baju
-Bak cornet
-BakIron
-Baka Mop
-Baka Prase
BakaOsaka
BakaPho
Bakazuro
@@ -4604,12 +3582,7 @@ BalazinGIM
Balboa Park
Balbuli
Bald
-Bald Arab
-Bald Male
-Bald Shupa
-Bald Sicknez
Bald To Bold
-Bald Wookiee
Bald at 29
BaldKnees
BaldMansKenn
@@ -4646,36 +3619,23 @@ Balob
Balontra
Balou
Balrogs Hell
-Balthazar BL
-Baltimohr
-Baltimore MD
Baltoth
-Baltramiejus
Baltzerboii
Balu
Balu Titan
Baluk
Bam Achilles
Bam Grizz
-Bambi0326
BambiSlayer
Bamboo
Bamboo James
BambooPandas
Bambuliuss
Bamf
-BamfJoe
-Bamfbeav
-Bamiman
-Bamse
-Bamztile
-Banan
Banefish
Banerz
Banio
Bank Stander
-Bankaiz
-Banki 1 1
Banzu
Bape
BapeNation
@@ -6146,7 +5106,6 @@ Bmoot
BmwNerd
BnB
Bnaar
-Bo Ed
Bo Selecta
Bo0nies
BoBgss126
@@ -6171,29 +5130,15 @@ Bob44th
BobBojangles
BobCatMilk
BobGuenille
-BobNegao
BobRossDied
BobTheDaddy
BobaNeZmogus
Bobakadush
BobbaStanley
Bobbanxd
-Bobbiie
-Bobby
-Bobby Brawl
-Bobby JoJo
-Bobby Lash7
-BobbyBigLips
-BobbyBonk
-BobbyShurda
-BobbySmooth
-Bobbyccf
Bobbydrake09
-Bobbysweggg
BobbyyHill
-Bobi
Bobicles2
-Bobidabob
Bobite92
Bobo Bagins
Bobrobber
@@ -6604,22 +5549,16 @@ Boze Worm
Boze mol
BozeOog
Bozut
-Br ay
-Br ibb
-Br yan
Br00dje
Br0ox
Br0wnSpit
Br3ws
Br4dders
-Br4w
Br5andon
BraBraBrad
Braaamps
Brabbss
Brad
-Brad RS
-Brad T King
Brad017
BradIsAChad
BradIsChad
@@ -6680,7 +5619,6 @@ Brando23x
Brandog
Brandon
Brandon 126
-Brandon TJ
Brandon9250
BrandonLarge
Brandonp32
@@ -6718,7 +5656,6 @@ Brazeheart
Brazzerker
Brb Delivery
Brblol
-Brdy
Breaches
Bread
Bread Again
@@ -8231,9 +7168,7 @@ Cewl
Cewl Hwip
Cexilius
Ceyyl
-Cf b4
Cfretz244
-Ch i
Ch i c k en
Ch ief
Ch00bies
@@ -10096,11 +9031,6 @@ Cvanz
Cvbgn
Cvrkster
Cvrsn
-Cw90
-Cwab
-Cwazza
-Cweavy
-Cwer
Cwick
Cwioktopus
Cxffee
@@ -10111,7 +9041,6 @@ Cyal8rnub
Cyan
Cyan Ablaze
Cyasoon
-Cybb
Cyber Mind
Cyber n Bug
Cyber172
@@ -10180,78 +9109,6 @@ Czechmate
Czha
Czivend123
Czk
-D A I J I N
-D A L M
-D A M 0
-D A M I A N
-D A M N L0L
-D A N G I T
-D A N N Yy
-D A T H I T
-D B A
-D B Z pker
-D Blo
-D Clawz
-D Darkblader
-D Derbles
-D Dragon124
-D Duberstein
-D E C O
-D E F Q 0 N
-D E F Q O N
-D E R P
-D E V I N
-D F U Q
-D I Q
-D I R T Y Ko
-D J Diddles
-D Long
-D M T Elves
-D O D
-D O M M E L
-D R 6 K E
-D R l Z Z T
-D Rack4
-D S A V
-D Squarius
-D U R K
-D Wilson
-D Wreck
-D a mo
-D a r t s
-D a rk
-D a u t o
-D a v i d
-D amz
-D arking
-D arkoz
-D as
-D ashing
-D avey
-D axe
-D db
-D ebol
-D ecimate
-D eej
-D eek
-D eep
-D eez
-D en
-D enial
-D entist
-D i l a n
-D i x o n
-D i zz y
-D iesel
-D iizzy
-D imi
-D imitri
-D onda
-D onger
-D oo l ey
-D op e
-D utchgr
-D-D-A
D00DLES
D00dey9
D0CTOR
@@ -10301,16 +9158,9 @@ D4nnyy
D4rels
D4rk
D4rth
-D7NNY
-D9
-D9R
DA ODB KIDZ
DA0IST
DA3N33RY
-DA4N
-DAD563884271
-DADDYS IR0N
-DAHDB
DARCHANG3L
DARGON
DASH
@@ -10318,14 +9168,10 @@ DAWGPOUND
DArtspret
DBA Paulo
DBKangaroo
-DBO90
DBOL TRICEPS
DBUZZ
DC Flubber
-DC-8-51
DCreek
-DD 214
-DD G
DD2I4
DDAlt
DDSurWrists
@@ -10341,17 +9187,12 @@ DESPA SIITTO
DESPAlRGE
DESTYLAT
DFez
-DG 00
DGAF
DH Marker
-DH btw
DHIBZ
DHSC4EVER
DHally
-DHlN
DHoShow
-DIDZZ
-DIETDRDIET
DINGO SCUM
DIORITIC
DIORITlC
@@ -10380,19 +9221,9 @@ DJMileyCyrus
DJMuscleBram
DJOFULLIN
DJSeinfeld
-DKHo
-DKJN
-DMM 2 07
-DMM Gp Swap
-DMM Ryu
-DMT Dad
-DMT Satan
-DMTDAN
-DMTe
DMagnum 10
DMessengerS
DN Atro
-DN20
DNFL
DNLD
DO0FY
@@ -10405,12 +9236,10 @@ DONJOHNNNY
DOOMBRlNGER
DOOMSlayer
DOSNE
-DP776
DPRNS
DPS Disciple
DPvM
DPvM Jordan
-DQ9
DR PAAAK
DR VABA
DRAEG0
@@ -10453,9 +9282,6 @@ Da Nils
Da Puppy13
Da Sniper007
Da T Virus
-Da d dy
-Da t
-Da then bh
Da1ton
DaBears
DaBoz
@@ -10519,9 +9345,6 @@ Dachowski
Dackel
Dackenerino
Dacune
-Dad Goals
-Dad Sean
-DadBurrys
DadGoingMad
DadLeft
DadRanarrWay
@@ -10529,8 +9352,6 @@ DadamoSte
Dadbackward
Dadbackwards
Dadbod4lyfe
-Daddaforce
-Daddy
Daddy Bundy
Daddy Chaman
Daddy Chubs
@@ -10562,7 +9383,6 @@ Dadfield
Dadi415
Dadorii
Dadosaur
-Dads
Dadukez
DadurQa
Dadyankee3
@@ -10610,8 +9430,6 @@ Dahlareen
Dahls
Dahlson
Dahmonkey
-Dahrmata
-Dahrr
Dahumbug
Daijoukay
Daiju Spede
@@ -10778,15 +9596,11 @@ Daniella
DanielleOfc
Danielmcken1
Daniels
-Danielwat
-Daniiieell
-Danijenn1211
Danilin
Danimal
DanisH96
DanishAdonis
DanishGoat
-Danje
Dank
Dank Chef
Dank Exp
@@ -11070,14 +9884,6 @@ DavidPH
Davidisiscoo
Davidopathy
Davis751
-Davlan
-Davo
-Davord
-Davoron
-Davros70
-Davshing
-Davu
-Dawaj Lama
Dawg Dynasty
Dawkins
Dawn
@@ -11120,13 +9926,7 @@ Daze
DazedDave
DazednConfsd
Dazzler95
-Dazzz
-Dbeatz
-Dbewt
-Dbmx
-Dboot
Dbricke
-Dbz Pride
Dc B L I N D
Dc Hakkarn
Dc IronMan
@@ -11139,8 +9939,6 @@ Dday6Jun1944
Ddestroyer56
Ddos
Dds4theko
-Ddsing
-Ddsme
De Algerijn
De Baardman
De Eryngy
@@ -11158,7 +9956,6 @@ De Redacteur
De Sam Matie
De monic
De stoutsten
-De us
De1icioso
DeAndre
DeDawgTubb
@@ -11170,7 +9967,6 @@ DeHijskraan
DeIronMan
DeIronedMan
DeKawika
-DeLL
DeLooter
DeLouuu
DePope
@@ -16770,20 +15566,15 @@ Fyrox
Fyszz
Fyzio
Fziaa
-G
G 0 A T
G A F F E R
G Alfansos
G Ape
-G B S
G Check
G Fruit
G GAMER GIRL
G I M Danny
G Iron Adam
-G L E N
-G L H F
-G M B
G Man9822
G Mauls
G O O D
@@ -16791,36 +15582,21 @@ G O O S E Y
G R E E N
G R I L L O
G Terminator
-G X F C
G Zus
G a r t y
G a t t s u
-G ante
-G dot C
G e n g a r
-G eeb
-G i j s
G i l b o
-G iG
G imme
-G iooo
G l R L
G laze
-G no Z
-G o G G u
-G o h o
-G o th i X
G oldd
G oldeen
G oofy
-G ozz
G rafix
G ronimo27
G root
-G shi
G u a m s
-G unitt
-G-F-M
G-IronKuv
G-Thug Nasty
G-knowww
@@ -17064,15 +15840,8 @@ GTRKingZilla
GUBIDUBII
GUCCI SENPAI
GUCCl
-GUJ0
GUNMAN683
-GURRD
GUUMBY
-GVSU
-GYDtown
-GZA
-GZX
-Ga l
Ga7ba
Gaara
Gaara Sand
@@ -17270,7 +16039,6 @@ Gastje888
Gastronaught
Gate
Gateofdoom
-Gath
Gato
GatoNaranja
Gator
@@ -17297,9 +16065,7 @@ Gavy
Gawd Bodi
Gawk5000
Gawkes
-Gawkss
Gawt
-Gawz
Gay 4 Guthix
Gay Bear
Gay Bear Cub
@@ -17557,23 +16323,11 @@ Geuld
Gew
Gewoon
Gezang
-Gf g
Gf4tiuser
GfRsIGotAGf
-Gfi
-Gh3t0 T4nk3r
-Ghafir
-Ghaipol
-Ghandizy
-Ghandy
-Gharron
-Ghckkrchkrer
-Ghda
-Gheed
Ghentiana
Gherkins
Ghetto
-Ghhjgwsr
Ghidorah
Ghillie Suit
Ghilly
@@ -17793,10 +16547,6 @@ Gixerikan
Gizmoed
Gizmoo247
Gizzy-71
-Gj nice
-Gjerloew
-Gjonunaki
-Gktr
Gl Bob
Gl Im Dandy
Gl Im Tom
@@ -18905,36 +17655,6 @@ Gytisr9
Gyts
Gyym
Gz Parsec
-GzBs
-H 0 U N D
-H 2R
-H A D O
-H A I D E S
-H A M M E H
-H A R L S
-H A T
-H A X 3 D
-H D M P
-H E A L E R
-H E J S A N
-H O L M E
-H Q Killer
-H S 7
-H U L K K
-H U N A J A
-H a t y
-H a w n y
-H abs
-H alo
-H ch
-H e c t o r
-H i n e s
-H l E U
-H obbs
-H owl
-H rekDoer
-H uff
-H-tsi
H0B0
H0DEX
H0LINESS
@@ -18942,8 +17662,6 @@ H0NA
H0PES
H0RSEFIGHTER
H0RY
-H0j
-H0j00
H0lyPorkyPig
H0me
H0nestyBe
@@ -20120,7 +18838,7 @@ Hislordship
HisokaX4
Hispeeed
Hissi-Timo
-Hit U
+Hit U
Hit By Car
Hit Points
Hit The Guam
@@ -20153,7 +18871,6 @@ Hldz
Hlep
Hlnub
Hm
-Hmg Hawj Str
Hmm Fr Bruh
HmmKoekjes
Hmmer
@@ -20297,8 +19014,6 @@ Hompski
Hon
Honaz
Honchcrow
-Honda Coupes
-HondaXJ20
Honden
Hondo Ohnaka
Hondsvot
@@ -20800,9 +19515,7 @@ Hyun
Hyxbe
Hyze
Hyzers
-I M
I Skilz I
-I ADK I
I AM DROID
I Am Arun
I Am Calysto
@@ -20817,7 +19530,6 @@ I Am Vexed
I Am Vono
I Am Xyience
I Am Yesac
-I B Z
I Barak I
I Be Vibing
I Be Yankin
@@ -20860,12 +19572,9 @@ I Heal DHers
I Herb Store
I Hunt Pets
I Hustle Man
-I I ODIN I I
I JANGLER I
I Judgee Yu
-I Ko U Lol 1
I L0ve Lolis
-I LOTR I
I LV PEACH X
I Lezima I
I Liam I
@@ -20882,8 +19591,6 @@ I Luci
I Luhhya
I Luv tSwift
I M A P nuss
-I M Ket
-I M S N Y
I M The Weed
I Maxed OSRS
I May Be
@@ -20894,10 +19601,7 @@ I Need 1M
I Need Succ
I Need aBeer
I Novato I
-I Nz I
-I OX
I Owning
-I P0
I P0KY I
I Parry I
I Peter I
@@ -20906,10 +19610,6 @@ I Plank Lots
I Play Aegis
I Pod335
I Pri
-I Q T
-I R N B R U
-I R O N 99
-I RC
I ReAPeR I
I Roll Need
I Ron Man
@@ -20981,7 +19681,6 @@ I sak
I smell zaza
I so pale
I squared R
-I t I s
I tbag cows
I used to Rc
I van
@@ -20989,11 +19688,6 @@ I vinrox
I w4ste xp
I wana dew u
I want wings
-I-IEEBO
-I-Iulk
-I00OOOOOO00I
-I2P
-I2m
I2ocky
I2ossiiii
I3ET
@@ -21004,9 +19698,7 @@ I3ox
I3rucex
I3ubbles
I3ulow
-I7I
I7iablo
-IA
IAM HARDWELL
IAMBillNye
IAMDouble_C
@@ -21035,10 +19727,7 @@ IBloodwing
IBuyGF5GP
IBuyPowers
IBuyShungite
-IC 3
-IC XC NI KA
ICE GIANTT
-ICNK
ICantFit
ICauseRage
ICrazyCamelI
@@ -21050,12 +19739,6 @@ IDiabloI
IDustie
IEATEDYU
IFALL3NI
-IFIFIFFIFIF
-IFIFIFIFFIFI
-IFIFIFlFIFIF
-IFRC
-IFRS
-IFRS 9
IFartOnBaby
IFernedYou
IFistBonk
@@ -21074,31 +19757,19 @@ IHuntKoalas
II Fabi II
II Gots Piie
II Mossy II
-II TurMz
-II0III
-II0v0II
IICyRaNoKII
III SLAYR
-III jin III
-IIIBCIII
IIIGavinIII
IIIel0n
IIIusionist
-IIKOO
-IIPAC
IIPrincesaII
II_Blanx_II
IIamaman
IIflemishII
-IIlIIAS
-IIlIIoIIlII
-IIllIll
-IIlllllIIlIl
IIndy
IIrisviel
IIsaac
IIx Link xII
-IJzer Bal
IJzermeneer
IK Pegasi
IKotol
@@ -21188,9 +19859,7 @@ IMAEATURASSS
IMAFKNNONCE2
IMGOKU1
IMHankey
-IMHky
IMJeffG
-IMMezzo
IMNagrom
IMPERlO
IMPlayerjohn
@@ -21264,18 +19933,11 @@ ITIajestic
ITIallen
ITIasKilleR
ITIassacre
-ITIatty
-ITIerica
-ITIiko
-ITIoj
-ITIoosh
-ITIr
ITSPYRO
ITV X
IThe Beatles
ITrimGlories
ITurtlekunI
-IUR
IUntradeable
IV Luke
IV skin
@@ -21296,8 +19958,6 @@ IVIush
IVIxtthew
IVOXYGEN
IW Lytheria
-IW4M
-IWGP
I_Eat_Ass04
I_Inity
I_Noodz_I
@@ -21494,8 +20154,6 @@ IkkleHorvick
Il
Il MrBorn lI
IlIBooieIlI
-IlIIIIlIIIlI
-IlIIlIllIlII
IlINard0IlI
IlRisklIlIlI
Ileeze
@@ -21569,12 +20227,10 @@ Im Hawkward
Im Hersh
Im Huck
Im Hunta
-Im Hussain
Im Iron
Im Iron WTF
Im Jags
Im Jokers
-Im Jovian
Im Just Ken
Im Krazy
Im Kyle Btw
@@ -21715,7 +20371,6 @@ ImVanilla
ImWargasm
ImWilbur
ImYourDadBTW
-ImZe
ImZorp
Im_Stone126
Ima Guy
@@ -21792,8 +20447,6 @@ Improv
Improved
Impulsive Au
Impurest678
-Imql
-Imre
Imsain
Imsokwtie
Imstratss
@@ -22026,7 +20679,6 @@ Ionia
Iono
Iou689
Iowa146
-IowaCJ
Ioyal
Ioyins
IpeeInTheSea
@@ -22044,9 +20696,6 @@ Ir0nMammoth
Ir0nMish
Ir0nPuma
Ir0nRagnarok
-IrDA
-Iralimir
-Irha
Irid
Irie
IrieLuDa
@@ -22919,95 +21568,6 @@ Izvorul
Izzy
IzzyBigBoy
Izzyboy300
-J 0 S H Y
-J 0 S H l
-J 4 6
-J 4 K E
-J 6
-J A B S
-J A I D A N
-J A M A L
-J A N K I
-J A U N U S
-J A W D
-J Breezi
-J C Trousers
-J D
-J D Ballew
-J Dahmer
-J E E V E 5
-J E T
-J F
-J Fred Run
-J I M M
-J I MM Y
-J Kole
-J Kribzz
-J L A
-J MF B
-J Neat
-J O E G
-J O L T I K
-J O T A
-J O3Y
-J R O C
-J R V
-J Rat Cow
-J S 2 M
-J S Z M
-J Saints
-J Suave
-J U S T A S
-J U Z
-J a c k a l
-J a c k son
-J a c k y
-J a mie
-J a n i
-J ackal
-J al
-J ameper
-J anii
-J appie
-J asnah
-J ason
-J asyra
-J ayson
-J bellfortt
-J bird shady
-J e sse
-J eff
-J effy
-J ensen
-J esse
-J essica
-J imme
-J imy
-J imz
-J ipr
-J lMM Y
-J o b e
-J o e
-J o ey
-J o f
-J o s h y
-J oep
-J ohannes
-J ointz
-J oke R
-J or G
-J oshh
-J oshhh
-J osie
-J u wu
-J ung
-J unko
-J utch
-J uun
-J uwu
-J x B
-J yy
-J-2tha-R-O-C
J-Man 93
J-Turn
J-Yeezy
@@ -23034,22 +21594,7 @@ J0seph
J0shh
J1MB0H
J1NBE
-J1ub
-J2TR
J2caine45
-J2ck
-J328
-J3Ciron
-J3JU
-J3S5E
-J3rkkuHD
-J41AL
-J45e0wns
-J4QS
-J4S
-J4gga
-J4my
-J95
JAABASNABBA
JACK3DJOHNNY
JACKYOUNG93
@@ -23061,79 +21606,30 @@ JAVON 9-INCH
JAYJ51
JAYR0CKBABY
JAlDYN
-JB 2K
-JB87
JBGard
JBrody
JBuck057
JBux
-JC-1989
-JCS07
-JCole
-JCon
-JCutler
-JD MD
-JD4
-JDBass
-JDEP
-JDFlaSh
-JDJM
-JDez
-JDlion
-JDredd66
-JDuck
-JE B
JEEZE
JENNY
JENNY DEATH
JERN SVIN TO
JETSNBEERS
JF Kennedy
-JFB
-JFCK
JFK gone AFK
JFKautopilot
-JFL
JField
JFrog
JFryGuy
JGIRONTG
-JGIV
-JGlen97
-JH3305
-JH91xx
-JHINitalia
-JIGGYWIGGY
-JIIVEE94
-JJ-M
-JJ23
-JJAAKKO
-JJBW
-JJPowers
-JJROCKETS
-JJRicky
-JJS BBQ
-JJSM_Dulker
-JJchris66
-JJoe
-JJumalwelho
JK Rowling
-JKMi
-JKTimbo
-JKUR ON 40S
-JKeM
-JKingJ777
JKrollin
JKuyaa
-JLG
JLowe
JLsone
-JMI NG
JMTaipei
JMack
JMiddd
-JOBBO
-JOCKO00O0O0O
JOE EROTIC
JOKER 709
JON3ZYY94
@@ -23149,9 +21645,6 @@ JPantless
JPatness
JPence
JPountney
-JPudz
-JR05E
-JR0D
JRBeast
JRC Crypto
JROGU
@@ -23167,32 +21660,12 @@ JSilvester08
JSlice94
JSplash
JStepho
-JT5
-JTAG
-JTCS
-JTI ain
-JTIAIC
-JTM33
-JTscape
-JUGIB
-JUIBE
JUICEWRLD9 9
JULlAN
JUST
JUST A HlPPO
JUST Nikk
JUSTICE
-JWRLD
-JXJ
-JZB
-JZX1O0
-Ja k ey
-Ja m e s
-Ja mes A
-Ja se
-Ja sn
-JaBouris
-JaDig
JaStraater
Ja_Fireking
Jaaaakkoooo
@@ -23300,32 +21773,11 @@ JadsVag
Jaecob
JaegerBoom
Jaeson
-Jafacakeman
-Jafanto
-JafarTooHigh
-Jaffa Jake
-Jaffar
-Jaffywaffy
-Jafsx
-Jagdpanther
JagerBombski
JagerIron
Jagermeister
Jagged
Jaggen
-Jaghatai K
-Jagoodiii
-Jah toch
-JahIthBer
-Jahaerhys
-Jahaok
-Jaharred
-Jahbby
-JahgexPlzzz
-Jahmay
-Jahmerica
-Jahngles
-JaiSiaRamJai
Jaiden184
Jailbreak455
Jaime 427
@@ -23354,13 +21806,6 @@ Jakey
Jakey C
Jakeyosaurus
Jakeyz
-Jaknop
-Jakrem
-Jakrojan
-Jakuli226
-Jal-Nib-Jmal
-JalNib
-Jalduii
Jaleesa
Jales
Jalim Rabei
@@ -23394,24 +21839,17 @@ James Kelp
James Poncho
James PvE
James Rolfe
-James c
James osrs
James1087
-James2709
-James9
-James945848
-James9520
JamesBondss
JamesCUFC
JamesDaWizar
JamesHaliday
-JamesJ2019
JamesLango
JamesMaynard
JamesNI
JamesPratt94
JamesShotGG
-James_22
Jamesay
Jamesbombom
Jamesrb1
@@ -23440,9 +21878,6 @@ Jamosbondos
Jamppa
Jampy
Jampyre
-Jamuli
-Jamurazi
-Jamwa
Jamyroo531
Jamzylockz
Jamzz
@@ -23479,21 +21914,6 @@ Janne
JannpajII
JanoPotato
Jansky
-Jansz101
-Jante
-Jantex
-JantheBear
-Jaooa
-Japanese
-Japhur
-Japiohh
-Japles1
-Japoolie
-Jappieee
-Jappieness
-Jappo
-Jaqen
-Jaqquu
Jar Of Pets
Jar Uh Dirt
Jar of Pukes
@@ -23622,47 +22042,8 @@ Jayster
Jaytea
Jayteaf
Jaytee1262
-Jaywub
-Jayy
-Jayy Slays
-Jayy x
-Jayzar
-Jaz Coleman
-Jazo
-Jazpurs
-Jazz
-JazzFlap
-JazzMaster09
-Jazzeh
-Jazzjr89
-Jazzly
-Jazzy
-JazzyFlips
-Jb Godranger
-Jba123
-Jbevzzz
-Jblieves88
-Jbob72
-Jbt
-Jbvff
-Jc_TheCops
-Jcb4646
-Jcdelavici
-Jchn
-Jcmalone23
-Jcolts20
-Jcourt1
-Jdaws
-Jdidy
-Jdoggy2018
-Jdp3
-Je nny
-Je pppe
-JeBoyHiddema
JeIlo
JeIly Man
-JeJoat
-JeK0
Jean
Jean belette
Jean man
@@ -23739,7 +22120,6 @@ Jelen
Jelenner
Jelior
Jella
-Jelle
Jelle Bouma
Jellie40
Jellisme_99
@@ -23755,12 +22135,9 @@ JellyBeanRs
JellyGenix
Jellydonuts
Jellyfishes
-Jelziin
-Jelzini
Jemades
Jemelope
Jemile
-Jen na
Jen0va
JenaTulwarts
Jenessa
@@ -23826,128 +22203,6 @@ Jerry Maine
JerryChinger
JerryMina
Jerryy
-Jers
-Jers Knot
-Jersh
-Jershawerr
-Jersion
-Jertz
-Jeru
-Jerunox
-Jerusalenm
-Jerziii
-Jerzy
-Jes2x
-Jeseeka
-Jesh g
-Jesh-mar
-JeshusChrist
-Jesiah
-Jesk
-Jesliq
-Jesper Bratt
-Jesper135
-Jesperyo
-Jess
-Jesse
-Jesse Top
-Jesseq
-Jessica
-Jessie
-Jessie Jones
-Jesspresso
-Jessy
-JessyTrip
-JessycaOSRS
-Jester Head
-Jesterbubba
-Jesus
-Jesus I love
-Jesus MPhys
-Jesus Saved
-JesusComing
-JesusRedeems
-Jet Jaguar8D
-Jet3010
-JetFlame
-Jeththe
-Jetlag
-Jetma
-Jetridder11
-Jetski
-Jetsmoke
-Jettiesimp
-Jettrider
-Jeugd
-Jev21
-Jevel
-JewFroBro
-Jewbaaca
-Jewbakah
-Jewbang
-JewishRob
-Jewy
-Jexlad
-Jexlo
-Jeyos
-Jeyzuz
-Jezeus
-Jezkoz
-Jezuux
-JezzaripHD
-Jezzie
-Jezzx
-Jf-n03
-Jfleeze
-Jfrith
-Jfuzzy
-Jglove
-Jgus88
-Jgy1889
-Jhackal
-Jhb
-Jhebs
-Jhny
-Jhonlovin
-Jhoocy
-Jhoocy Moot
-JhormanCovid
-JhosS
-Jhow
-Ji bs
-Ji m m
-Jia Lissa
-Jian
-Jiara
-Jibajaba
-Jibberflexed
-Jibbllyy
-JibinSui
-Jibneh
-JibrilMaster
-Jiffee
-Jig Bugs
-Jiga Chad
-Jiggalagg
-JiggerJoe
-Jiggity
-Jigglyboy
-Jigglywoo
-Jiggypufff
-Jignite
-Jigoogly
-Jih
-Jihe
-Jihne
-JiiU
-Jiiko
-Jiim Lahey
-Jiiraiiya
-JikdarShark
-Jikkurr
-Jiklim
-Jill Hyde
-Jille Man
Jim
Jim Sauce
Jim Shorts
@@ -24006,9 +22261,7 @@ Jims Ironing
Jimsterjim
Jimver
Jin Oh
-Jin R n G
JinDoritos
-JinJ0 nJuice
Jinb
JingleBiloba
Jingy
@@ -24046,22 +22299,12 @@ Jixr
Jixx0x
Jiyool
Jizt
-Jj Dynomite
-Jj Jerk2
-Jjar127
-Jjjjjj210
-Jjozzie
Jk Esq
Jkdogg
Jkhby
Jkl Kalja
Jkolrur
Jkrexx
-Jku45
-Jl-SOO
-JlGA
-JlLLY
-JlMMB0
JlZZB0SS
Jlarge
Jlova
@@ -24081,27 +22324,9 @@ Jmz
Jnas
JnrSeneca
Jnsthenx
-Jnup
-Jnwp
-Jo Pain
-Jo de Coeckh
-Jo h 2
-Jo iron
-Jo rd an
-Jo shua
-Jo we
-Jo0l
-Jo3 H
-Jo3p
-Jo5p
-Jo6p
-Jo711
JoE ShMoee
JoEiSaFiShEr
-JoJi
-JoJo
JoJo Skriver
-JoJo79
JoJoJoUrBoat
JoKerRtheGOD
JoMoe
@@ -24156,7 +22381,6 @@ Joee P
Joeholding
Joekle
Joel
-Joel 9444
Joel In Pain
Joel Lobster
JoelBtw
@@ -24246,16 +22470,6 @@ Johnsters4
Johny
Johny Aus
JohnyLocoo
-Johnyy
-Johuab
-Johzyn
-Joizz
-Jojis
-Jojj
-Jojkan
-Jojo Rabbit
-Jojora
-Jojy
Jok
Jokar
Joke
@@ -24432,46 +22646,6 @@ Josh x
Josh013
Josh2Godly
JoshD
-JoshDagainz
-JoshGymnast
-JoshMarksman
-JoshYewAhh
-Joshalog
-Joshan
-Joshery
-Joshh
-Joshhhh
-Joshii
-Joshimitzu
-Joshism
-Joshjoshin
-Joshmaster31
-Joshpaul
-Joshua
-Joshuaaaah
-JoshyCii
-Josiah Higha
-Josiahs
-Josoust
-Joss
-Josse
-Jostavo
-Josti O_o
-Jostle
-Josue
-Josukes
-Josylvio
-Jota_420
-Jote
-Jothha
-Jotjemenotje
-Jotq
-Jottini
-Jotunheimar
-Jotwe
-Joueur4376
-Joulaha
-Jovial
Jovilius
JovyGaming
Jowah
@@ -24491,21 +22665,9 @@ Jpan1
Jpellican
Jpq
Jqwss
-Jr Metro
-Jr Muffin
-Jr Stigel
-Jr2k13
-Jrabbat
-Jrby
-Jrdn
Jreppks
Jrey
Jroanirr
-Jrodjok
-Jrogo
-JsJays
-JsN4
-Jsag
Jsi7111
Jsnn
Jsony
@@ -24595,18 +22757,6 @@ JuicyTigr
JuicyWetNut
Juicy_Newfie
JuiicyAF
-Juikki
-Juint
-Juipp_Iron
-Juisy
-Juk e
-JukeLess
-Jukebot
-Juked
-JukeduM
-Juko
-Juktes
-Jul es
Jules
Julesbak
Julia
@@ -24764,100 +22914,9 @@ Juun Solo
Juuna
Juunaz2chips
Juustis
-Juuzo
-Juvi
-Juvian
-Juzzy
-Jvzy
-Jwad
-Jwcsg
-Jwd
-Jwett
-Jwu
-JxJxV
-JxcelD
-Jxck
-Jxcx
-Jxdidiah
-Jxdooo
-Jxhnn
-Jxke
-Jxmeson
-Jxnas
-Jxni
-Jxstxn
-Jxxst
-JxyStorm
-Jy
-Jybais
-Jyeronese
-Jygers
-Jyhlln
-Jyhy
-Jype
-Jyppedi1992
-Jysk
-Jyura
-Jyy
-Jyypy
-JyzzBrah
-Jz
-Jzbeta
-K 1 L L A
-K 1 P
-K AMI
-K B D autism
-K E K E B
-K E L A
-K E T CHUM
-K E V 0_O
-K Hades
-K K Boef
-K NW
-K O L L I
-K O M P I S
-K OOOOOOOOOO
-K P N
-K P Sweet
-K Smalls
-K W
-K W A L A
-K Y Y
-K a l e w i
-K a z a
-K aarel
-K ayyla
-K eller
-K elvin
-K en
-K etaminer
-K ev
-K iNG IRON
-K idd
-K ilo
-K im
-K l 9
-K l N G S
-K nauss
-K nut
-K o j o
-K o o s a
-K ohen
-K orruptt
-K ree
-K rs
-K t r n e
-K una
-K ushi
-K uz
-K voth e
-K y u m a
-K yogre
-K-Diddy
K-epan
K-market
K0
-K0 4
K00LBR33ZE
K0F
K0L0S
@@ -24873,7 +22932,6 @@ K0rnuit
K0tleciokas
K0veras
K0zor
-K19
K1ERZ
K1LLY
K1ddl3
@@ -24883,8 +22941,6 @@ K1ngo
K1ngshredder
K1r1t0123
K2 Jung
-K32
-K38
K3KSE
K3U S2
K3azkoks
@@ -24892,26 +22948,18 @@ K3fka
K3kt
K3mi
K3nn3d
-K44K
-K4IF20
K8iee
-K99 2
-K9Father
K9lenny
K9rk
-KA97
KABBABEAST
KAKAGUATE0
KAKERANDELIN
KAL-JML
KAMlX
KAT alyzt
-KB1988
KBARAKAT
KBX0
KC Chiefz
-KC M0
-KC8
KCRB
KChiefn
KDOG1419
@@ -24938,7 +22986,6 @@ KGP
KGee
KGoldy
KHADER
-KIIIIIIIIIIH
KILLER COMBO
KILO
KIMB0
@@ -26887,58 +24934,6 @@ KyuubiKurama
Kywt
Kyykin
Kzyl
-L 0 S T Y
-L 3 G 4 C Y
-L 67
-L A R A M S
-L Ben
-L CBO
-L D A
-L E G E N D
-L E G O
-L E L O
-L E P I
-L F C
-L FC
-L Hus
-L I N U X
-L I V M
-L OAFS
-L S Q
-L U I G
-L U U K E
-L X R D S
-L achie
-L aika
-L aka
-L ama
-L ang
-L apras
-L atias
-L aw Rune
-L aze
-L e an
-L eafErikson
-L egs
-L ek
-L emaster
-L ev
-L i m a a
-L iamm
-L iar
-L ilo
-L inox
-L ions
-L o w g
-L ockdown
-L ofty
-L osi
-L paradoxum
-L u m i
-L u mi
-L u x
-L ucas
-L unatic
L00000
L00M
L00OL0OO00OL
@@ -27026,8 +25021,6 @@ LIMEWORLD
LIQUICITY
LITEIT
LITHITS
-LJ 8
-LJAP
LJPalmer
LKIT
LL Trigger
@@ -27056,10 +25049,7 @@ LOSTinGAMES
LOUlSlANA
LOWIQXD
LP Smokie
-LRG
-LRGD
LRichyy
-LS1
LS3D
LSD-25
LSDDS
@@ -29076,81 +27066,6 @@ Lyyli PL
Lyzu
Lzin
Lzs
-M A G 3
-M 1 KE
-M 3 3 P
-M 4 T R I X
-M 8 A 1
-M A D O X
-M A D Storm
-M A T E J
-M A X O U T
-M A X PAYNE
-M B Z
-M E H I S
-M E L D O
-M E T R O
-M E X I
-M I K B A R
-M I T H O X
-M I U
-M I Z Z O U
-M INDGAME
-M Itty
-M K J
-M O B I L 3
-M O C 0
-M O C H
-M O ID O K
-M R NaCl
-M Super Buu
-M T C
-M U D K l P
-M X G P
-M a V 3 Rick
-M a d Shrumn
-M a k a i
-M age
-M aikel
-M ak0
-M ammoth
-M ana
-M ankDemes
-M anu
-M aples
-M arcel
-M arquim
-M artin
-M ask
-M athis
-M axou
-M azzz
-M c
-M elz
-M enzy
-M ga
-M gh
-M i t c h y
-M i y a
-M ikasa
-M ike
-M imik
-M int
-M itchel
-M ittens
-M l Q Q
-M merz poL9
-M o C e
-M o r t e n
-M oist
-M onkfish
-M orytania
-M the Maxed
-M ugger
-M ulas
-M urphy 2
-M usashi
-M-theory
M00CHIE
M00SE M00SE
M01
@@ -29271,55 +27186,38 @@ MCHammered
MCKenny91
MCSIZZLE
MCmattt
-MD7
-MD96
MDE Presents
MDPS
-MDaher
MDucks
MEAT G0D
MEAT HEAD36
MEGATRON
-MEK4KK4KK4KK
MELAN00MA
MELT
METM0NKEY
METR0lD
METS0
MEV4NS
-MF DC
MF MORTEN
MF SofaKing
MF TEE
-MFE
MFKU
MFLI
MFSTEVE
-MG5
MGFS
MGKRevs
MGM WAY
MGreengrass
MH Therapist
-MHA C
-MHBC
-MHS
MIDAs
MILFmauler
MILSHAKE
-MINH
MISOGl
MISSYGAMlNG
MIST
MITCHY
MIX0R
-MJ23
-MJKaboose2
-MJT
MK-HARDSTYLE
-MK6R
-MKAM
-MLB
MLTEEZY
MLaidman
MMMahogany
@@ -29332,10 +27230,6 @@ MOMHUNTER666
MON5TER
MOODSWlNGS
MOOSEM3AT
-MOTM
-MP17
-MP9
-MPB
MR JOHN WlCK
MR LETHAL2u
MR REET
@@ -29347,7 +27241,6 @@ MRC Tugboat
MRGAMEZ
MRHD
MRLARGE
-MRM
MRPlZZAPRIZE
MRWHlTE
MR_MAITO
@@ -29355,18 +27248,12 @@ MSPaint64
MSceneFF
MSpacePotato
MStarkz
-MTBMB
-MTPETE
-MTV CRlBS
-MTXP
MUISSS911
MULHERndaEXP
MUMM0
MURMELl
MUSK
MUSK0KA
-MUSUMUMM
-MUZAMMIL
MV Flow
MV Welshy
MVIII
@@ -29375,7 +27262,6 @@ MVP HERO
MVP Mahomes
MVRDA
MVTIASD
-MWwarzone
MY L U N A
MYRSKYVIITTA
MYTHICROYXLE
@@ -29383,7 +27269,6 @@ M_Sariol
Ma Band
Ma Dood
Ma Titi
-Ma t t h e w
Ma5onx
Ma7e
MaCoMb
@@ -31670,26 +29555,6 @@ MoetIkLopen
Mofaer45
MoffelRS
Mofleminator
-Mofo Lt
-Mofo Shadow
-MofoMo92
-Mofoe
-Mog Time xD
-Mogcow
-Moggok
-Mogtime
-Moh
-Mohahm
-Mohamedss
-Mohanad
-Mohannah
-Moheed
-Mohh
-Mohib
-Mohlo
-Mohnday
-Mohphy
-Moiqol
Moist
Moist Dreamz
Moist Holy
@@ -31702,8 +29567,6 @@ MoistWreck
Moistium
Mojimot0
Mojito
-Mojo Fiki
-Mojojojo171
Moju
Moju GG
Mojurico
@@ -32488,7 +30351,6 @@ MrsSocorelis
Mrslipkn0t
Mrwaffleses
Ms Goblin
-Ms K
Ms Lizziard
Ms Trap
Ms Zik
@@ -32529,47 +30391,6 @@ Muckball
Muco
Mud Cricket
Mud Temple
-Mud9
-MudCatBigDog
-Mudda Focha
-Muddas Main
-Muddy patch
-Mudguard
-Mudkins
-Mudkip
-Mudmur
-Mueezy
-MuerteBella
-Mues
-Mufasa
-Mufasa IXI
-MufffinKing
-Mufficer
-MuffinActual
-Muffinkyutie
-Muffins
-Muffinyatta
-Mufz
-Mugarooni
-Mugen
-Mugge
-Muggerman3
-Muggled
-Muggles
-Muggtjuven
-Mugrub
-Mugy
-Mugzy
-Muhaji
-Muhamed
-Muhfn
-Muhkea
-Mui Gokuu
-Muilpeer
-Muki
-Mukkaram7861
-Mukkey
-Muktheduck
MulasRevenge
Mulberry Mtn
Muleleaveox
@@ -32720,8 +30541,6 @@ Muziek Smurf
Muzket
Muzz
Muzzle
-Mv P
-MvP ov RnG
Mvk
Mvko
Mvp Scrub
@@ -32851,51 +30670,16 @@ Mythrin III
Myto
Myuf
Myuk
-Mywa
-Myz
Myzi
Mzaa
Mziy
-Mzr
Mztar
-N 10
-N 55
-N A l N E R
-N E L L
-N E N E
N Gallagher
-N I GH T96
-N I N O X
-N I S H
-N ICK Y
-N O B S Y
-N U B U
-N W M
-N a t t z
-N ang
-N anko
-N arb
-N dejay p
-N e a k i le
-N e i l
-N e0
-N iall
-N ibbler
-N ightgleam
-N l C K O
-N l E V E
-N o m a d
-N occo
-N oggin
-N u d
-N uggies
-N-J-R
N0 H34RT
N0 Invictus
N0 pid
N00biistyl
N00bslayer27
-N04me
N0B4Marri4g3
N0Ballz
N0ID
@@ -32912,26 +30696,12 @@ N0t Maxed
N0t special
N0tliketh1s
N0ul
-N1 CK
N17 Jake
-N1C3
N1NJASK1LLZZ
N1ckai
N1cwho
N1nja
N1njaCat
-N3XX
-N3p
-N3se
-N3x
-N4L
-N4ruto
-N4styNat3
-N7N
-N8vy
-N9NE420
-N9T7
-N9U
NABEEL RJ
NAGAKAMAL
NANORA
@@ -32940,14 +30710,6 @@ NASDBOY
NASSERN
NASTY
NAVl
-NB8K 2K13
-NBA
-NBA NewMain
-NBA Youngb0i
-NC90
-NCG
-NCG 2
-NCPS
NEBR0SKY
NECR0DANCER
NEEDAMETHYST
@@ -32964,14 +30726,9 @@ NEXFARMER
NEYOVIC
NFed
NHL Blues
-NHrn
NIIXIIK
NINJABLEV1NS
NINJATMNT
-NITR00
-NJC20
-NJWW
-NKJ
NL Chronos
NL Gilbert
NLDeluXe
@@ -32995,32 +30752,15 @@ NOTaPancake
NOmki
NPC Healer
NPC Icedrake
-NPYJ
-NRA
-NSFL
-NSHN
NST Praise
NT FiSHvv
-NT Y
NTBeerBandit
NTMR RADIO
NUEL
NULLI
NULLlN KUPPl
NUTSHOT
-NVQ
-NWHL
-NWI 219 RAT
-NY
-NY C
-NY G
-NY x LEGiiT
-NZ Dave
-NZL
-N_MB
N_other_day
-Na Mn Or I
-NaCl
NaCl Sprite
NaCl is salt
NaQ
@@ -33045,15 +30785,6 @@ Nacho Alt
Nacho2030
NachoByte
NachoDragon
-NachoPapi
-Nacht
-Nachtkastje
-NachuiTuda
-Nadaa
-Nadeo
-Nader
-Nadsage
-Nadund
Naethera
Naftininkas
Naga
@@ -33110,26 +30841,12 @@ Namine Silke
Namir
Nammer
Namuko
-Nana
-Nana Steel
-Nanado
-Nanciscor
Nancyy
Nander
Nandos
Nandos Man
NangMan
Nangdalorian
-Nanimavi
-Naniva
-Nannertee
-Nanno
-Nannu Baba
-NannyCam69
-Nanoh
-Nanoman360
-Nanonymouse
-Nanook IV
Nanoray
Nanotech
Nans
@@ -33179,38 +30896,6 @@ Naru808
Naruto
Narval
Narvalow
-Narwallus
-Narwhal1731
-Narx4
-Nas is like
-Nasa
-Nasaman
-Nascar
-Naseeph
-Nashh
-Nashluffy
-Nashonic
-Nashy
-Naskarsdad
-Nasko 07
-Nasper
-Nasrullah
-Nasseee
-Nassim
-Nast
-Nastacov
-Nastie
-Nastik
-Nasty
-Nasty107red7
-NastyAss
-NastyCasual
-NastyDonger
-NastyGarbage
-NastyGeUsers
-NastyV6
-Nasuuu
-Nat Scheetje
Natalie
Natby
Nate
@@ -33479,8 +31164,6 @@ Nerf Bowfa
Nerf Coffee
Nerf Th1s
NerfMePlz
-NerfTG
-Nergegante
Nergg
Nerio x
Nerithma
@@ -35685,24 +33368,15 @@ Ozzy Hobbit
Ozzykye
Ozzys
Ozzzyy
-P 0 W N E D
-P 0 E F
-P 0 R G I E
-P A M K A
-P A P Z
-P A R N Y
P DIRTY SODA
P EDRAO
P Eng
-P I T
P K
P O L I S H
P O T A T O
P O V I
P Purts
P R O X
-P R S
-P V M Lew
P W A Y
P Y R O
P a n x o
@@ -35764,7 +33438,6 @@ P4sk
P5ythix
P6D
P7DRO
-P9
PA N I C
PACK WATCH
PACKETLOSS
@@ -36344,11 +34017,7 @@ Pb and Jd
Pbby
Pbkillua
PbyOne
-PdaddyReborn
PdfPKerNoGF
-PdiddyReborn
-Pe en
-Pe t er
Pe1ipp3r
Peabody
PeacandLove
@@ -38185,12 +35854,6 @@ Pyzdalupi
PzK
Pzju
PzzaPredator
-Q 1
-Q K M Nophis
-Q Proserpina
-Q S L
-Q cs
-Q l ii Ma X
Q of Spade
Q uincy
Q-Dance Jr
@@ -49584,7 +47247,6 @@ USirHaveLost
USirHaveWon
UTT
UWCB
-UWF
UWUSTELIJA
UZY VS JAD
Ualt
@@ -49597,7 +47259,6 @@ Uber Yeats
Uberamazing
Ubersmind
Ubicorn
-Ubu
Uccino
Uchiwa
Uchr
@@ -49619,7 +47280,6 @@ Uh-0h
Uhbove
UhhhBoneless
Uhhhh Wut
-Uhm
Uhscended
Uidi One
Uim Beyonce
@@ -49679,7 +47339,6 @@ Umiland
Ummfufu
Ummz
Un Dutchable
-Un M-U-T-3-D
Un puma
Un-Expected
UnDutchable
@@ -54506,7 +52165,6 @@ apou
appelkneuz
applee
aqp frog
-aqqqqqqqqqqq
aquafx
araenel13
aratsanus
@@ -54515,20 +52173,7 @@ archyiop
arcvnaxiii
arcwriter
ard lad 06
-ardazz
ardy guardy
-arengs
-arevles
-arexmeister
-arfih
-argilah
-ari abdul
-ari shaffir
-ariman22
-arkoudaphile
-armadyyyyldo
-armyofkids
-arnr
arocardo
arookie
arouze
@@ -54559,7 +52204,6 @@ asian
asianbunnyx
asibioass
asidb
-asm
asmoooo
ason jones
aspiraring1
@@ -54571,9 +52215,6 @@ assbergerler
assdrag
asseaterbtw
assoffire
-astgferallah
-asuhcuh
-at0
atob7
atoma619
attaaM
@@ -54582,7 +52223,6 @@ auditore28
audrey
audrey horne
auma
-aus j osh
aussieyobbo
aut AT5
aut1st1c
@@ -54623,22 +52263,6 @@ azilim
aziz8mohd
azj
azura
-b a g
-b a l r a j
-b b o x x
-b eeg
-b enjy
-b ezos
-b i g s t
-b kuz
-b l u rr
-b oe
-b on ass
-b oo n
-b ooth
-b u l
-b ulba
-b-ray29
b00ty
b00tyw1zard
b0btehcool
@@ -54950,10 +52574,6 @@ bisse
bitten by
bitter
bitter fruit
-bj0rne
-bjassen
-bjpc
-bjuti
bkguytd6
bl00d twinz
bl00dShaman
@@ -55026,23 +52646,10 @@ blutorch
blvckstvrr
blynaas
bman5
-bmeow
-bnff
bnndt
bnqy
-bo bby
-bo nk
bo2Lawrence
bo3rke
-bo4r
-bob bob bob
-bobby ross
-bobby45153
-bobbyb727
-bobbyitsme
-bobbyjoe
-bobbytronx
-bober vvittu
bobfish66
bobness
bobondowski
@@ -55124,10 +52731,8 @@ boycie420
boydi
boydt
boyuniverse
-boz pwr
boze
bozo
-bp9
br0wnardRS
braap poster
bradrian
@@ -55263,18 +52868,6 @@ byEmilsson
byll
byrny
bzerk
-c a b l a y
-c bro
-c greyson
-c h u c kles
-c hainz
-c j t
-c m l
-c o 1 a
-c onorr
-c rompt
-c ubic
-c xx zz c
c-ross93
c00lbeer
c0vid
@@ -59902,14 +57495,7 @@ mlong06
mmaxie
mmigo
mmmkay02
-mmmmmmmmhmm
-mmmmmmnmmnm
-mmmuurrddaaa
-mndo
mniml
-mno
-mnt
-mo an
mobile
moer
mogwire
@@ -60014,13 +57600,6 @@ mstr nay nay
mtash96
mthic
muchderanged
-mucserup
-mudbitedlite
-mufassa
-muffing
-muggfac
-mugii
-muh
muh sheen
muhName
muhnamezjeff
@@ -60075,12 +57654,6 @@ myrtlecat
mys_try
mystic
myturngranny
-mzsc
-n a g a
-n k h
-n o m i s
-n oge
-n os
n00b tax
n00btube
n00dIe
@@ -60091,14 +57664,7 @@ n0rthmemphis
n1ch0las
n1ghtmares
n3cromans3r
-n4ts
-n8m
-n8n
nSubordinate
-nVox
-nYer
-n_koo
-na cba
naamarihomo
naapurintati
nabritches
@@ -60383,17 +57949,10 @@ nymue
nysyGG
nzskater
o Buffy o
-o Galaxy
-o Jay o
-o NEK o
o Pug o
o SiLeNce o
o Steven o
o c c u l t
-o chem
-o n e i n v
-o tp
-o tu
o0 Rang0r 0o
o00dan00o
o0Ganktank0o
@@ -60656,9 +58215,6 @@ oxyy
oysni tu
ozos
ozztrevor
-p hd
-p n g
-p x v x m
p000r
p0ge
p0tat0_baked
@@ -60730,7 +58286,6 @@ pazmar
pb tiramisu
pbagel
pbj eater
-pbjt
pcce
pd3
pdi
@@ -61057,9 +58612,6 @@ pzqlpwbma
q Aleks
q Nossie p
q b0nkerz q
-q f z
-q l l u
-q sl
q-Mini-p
q0k
q9q9q
@@ -61117,15 +58669,6 @@ qwruqwpourqr
qy
qz
qzxz
-r a i n i n
-r a i q
-r d x
-r eflex
-r ehab
-r i ley
-r n g o d
-r o c h i
-r pt
r u a pussy
r0adh0g
r0jasss
@@ -62393,12 +59936,6 @@ syytu
szer
szeth17
sztuk
-t iel
-t imbo
-t r a m
-t rio
-t u k e
-t ux
t-Wrench
t-painn
t0_valhalla
@@ -62657,11 +60194,7 @@ tjd1233
tjomka
tksnevrlucky
tmahones
-tmeer
-tmeer 18
-tmjdx
tmued
-to dd
to0Oldf0r1t
to_o
toad
@@ -62729,7 +60262,6 @@ toxiclun
toxicsaitama
toy Owner
tozmic
-tq
tr0nberg
tr0nd
tra1nwr3ck13
@@ -62993,12 +60525,6 @@ uz x
uzei
uzis akimbo
uzui
-v Simba v
-v olksu
-v oltage
-v tsng
-v uka
-v yp
v-yordan0702
v0i kehveli
v0mbat
@@ -63172,10 +60698,6 @@ vw
vzi
vzkg
w Danko
-w e b r l
-w en
-w ert
-w vy
w00_88
w00d pecker
w00tgh0st
@@ -63330,7 +60852,6 @@ whyamisofat
whynotp2p
whyuboolyme
whyzerkbro
-wi f
wibeton
widefang
wiegehtsmir
@@ -63375,12 +60896,10 @@ wiw
wizard129
wizardyoda7
wizkid499
-wjsn
wkurtin
wlkerTXrangr
wndow
wndy
-wngo
woah
wocket
wodg
@@ -63431,17 +60950,10 @@ wutzgood
wutzit
wwTakun
wweadge2
-www
-wwwMusic-Map
-wyat
wyattearp99
wyked
wytch
wyverns4days
-wzav423
-wzrdddddyo
-wzrds
-wzs
x 0lev x
x ABBlE
x Argonath x
@@ -63482,10 +60994,7 @@ x iyad x
x lollage x
x mk ultra
x preska x
-x r
x warri0r121
-x zi
-x zn
x073x
x0Mag
x0Tub
@@ -63594,15 +61103,6 @@ xHugsi
xHussla
xI3reeze
xIron Senpai
-xJeb
-xJiren
-xJlN
-xJolt
-xJord
-xJordd
-xJulia
-xJuve
-xKAJJEx
xKadi
xKdpunx
xKing
@@ -63822,7 +61322,6 @@ xtyrantix
xvn
xvrph
xvza
-xwl
xwuwesxdrf
xx darkminer
xxDerp
@@ -63843,8 +61342,6 @@ xzb
xzizzil
xzn 2
xzwu
-y om
-y w
y0y0keepitup
y37ir
y8s1
@@ -63869,10 +61366,6 @@ yapgragim
yasuo god69
yayasquirrel
ydoc
-ye idc
-ye ki M
-ye p to
-yea im jebus
yeahboi9992
yeahsmitty
yeahyoink
@@ -63897,9 +61390,7 @@ ykO Ops
ykeL
yleisradio
ylliB
-ym y
ymca4life
-yna
yo eight
yo itz ep
yobacha
@@ -63914,32 +61405,6 @@ yooyeet
yorkietootz
yorue
you died123
-you r a qt
-youb1n
-youneedcope
-young meows
-young vibby
-youngbriks
-youngmachine
-youngtrop21
-youngwings
-youpougou
-your
-your thrall
-youralterego
-youssef
-yowasupppbra
-yoyoma361
-yp
-ypoodle
-ypool4
-ypools
-yragbackward
-yrhs
-yribbles
-ytsud mi
-ytuiop
-yugiiii
yuh huh
yum
yummybolete
@@ -63960,13 +61425,6 @@ yyknaH J
yyttam
yyzanadu94
yzyzyzy
-z 5 x
-z Animal z
-z Rhodes
-z Shane
-z a p s
-z iQ
-z man827
z0nk
z0rrda
z0up
@@ -63999,10 +61457,6 @@ zSlay
zSpaceRaptor
zSwanny
zTitan
-zWxLF
-za2
-za33erklan
-zaaza
zacharial
zachhy
zachte
@@ -64029,7 +61483,6 @@ zazyga
zbra
zclx
zcollins
-zdi
zdin
zdya
ze4l
@@ -64091,10 +61544,6 @@ zionari
zippp
zirreael
ziurbtw
-ziuys
-ziyi_wangler
-zjh
-zjind
zlayaa
zlink10
zlliM
@@ -64124,7 +61573,6 @@ zruG
zrzwns
ztaM
ztkfps
-zu b
zubor1
zuenzima
zujal
@@ -64139,8 +61587,6 @@ zummorak
zurcc
zurlond
zuuryy
-zw
-zwah
zwint
zwolle
zwqpDEOXl23
@@ -64152,9 +61598,6 @@ zykez
zymaa
zymz
zysuna
-zzad
-zzai
zzben
zzero
-zzigma
-zzzJonno
+zzigma
\ No newline at end of file
diff --git a/Server/data/configs/object_overrides.json b/Server/data/configs/object_overrides.json
new file mode 100644
index 000000000..c00cbf672
--- /dev/null
+++ b/Server/data/configs/object_overrides.json
@@ -0,0 +1,165 @@
+[
+ {
+ "mode": "add",
+ "id": "1814",
+ "location": "3090, 3475, 0",
+ "type": "4",
+ "direction": "nw"
+ },
+ {
+ "mode": "add",
+ "id": "2646",
+ "location": "2445, 3413, 0",
+ "direction": "nw"
+ },
+ {
+ "mode": "add",
+ "id": "2646",
+ "location": "2447, 3414, 0",
+ "direction": "e"
+ },
+ {
+ "mode": "add",
+ "id": "2646",
+ "location": "2447, 3421, 0",
+ "direction": "nw"
+ },
+ {
+ "comment": "Prison Pete Random",
+ "mode": "add",
+ "id": "36788",
+ "location": "2094, 4465, 0",
+ "type": "10",
+ "direction": "e"
+ },
+ {
+ "comment": "Green Portal",
+ "mode": "remove",
+ "id": "11371",
+ "location": "2085, 4457, 0"
+ },
+ {
+ "comment": "Lever",
+ "mode": "remove",
+ "id": "10817",
+ "location": "2083, 4460, 0"
+ },
+ {
+ "comment": "Lever",
+ "mode": "add",
+ "id": "26191",
+ "location": "2083, 4460, 0",
+ "type": "10",
+ "direction": "e"
+ },
+ {
+ "comment": "Window",
+ "mode": "add",
+ "id": "26184",
+ "location": "2084, 4459, 0",
+ "type": "0",
+ "direction": "n"
+ },
+ {
+ "comment": "Door",
+ "mode": "add",
+ "id": "26186",
+ "location": "2085, 4459, 0",
+ "type": "0",
+ "direction": "n"
+ },
+ {
+ "comment": "Door",
+ "mode": "add",
+ "id": "26188",
+ "location": "2086, 4459, 0",
+ "type": "0",
+ "direction": "n"
+ },
+ {
+ "comment": "Window",
+ "mode": "add",
+ "id": "26184",
+ "location": "2087, 4459, 0",
+ "type": "0",
+ "direction": "n"
+ },
+ {
+ "mode": "remove",
+ "id": "37670",
+ "location": "3292, 3299, 0"
+ },
+ {
+ "mode": "add",
+ "id": "37304",
+ "location": "3292, 3299, 0"
+ },
+ {
+ "mode": "add",
+ "id": "20987",
+ "location": "3821, 2996, 0"
+ },
+ {
+ "mode": "remove",
+ "id": "356",
+ "location": "2804, 3428, 0"
+ },
+ {
+ "mode": "add",
+ "id": "356",
+ "location": "2804, 3428, 0"
+ },
+ {
+ "mode": "remove",
+ "id": "20228",
+ "location": "2537, 3573, 0"
+ },
+ {
+ "mode": "add",
+ "id": "27663",
+ "location": "2537, 3573, 0",
+ "direction": "w"
+ },
+ {
+ "mode": "add",
+ "id": "39237",
+ "location": "2957, 3266, 0",
+ "direction": "n"
+ },
+ {
+ "mode": "add",
+ "id": "39245",
+ "location": "2956, 3270, 0",
+ "direction": "se"
+ },
+ {
+ "mode": "add",
+ "id": "39242",
+ "location": "2955, 3273, 0",
+ "direction": "w"
+ },
+ {
+ "mode": "add",
+ "id": "39241",
+ "location": "2955, 3274, 0"
+ },
+ {
+ "mode": "add",
+ "id": "20987",
+ "location": "2821, 2996, 0",
+ "direction": "s"
+ },
+ {
+ "mode": "add",
+ "id": "21301",
+ "location": "2662, 3162, 0",
+ "direction": "e"
+ },
+ {
+ "mode": "add",
+ "id": "4176",
+ "location": "2629, 3661, 2",
+ "type": "4",
+ "direction": "e"
+ }
+]
diff --git a/Server/pom.xml b/Server/pom.xml
index 5c93c44d2..ffc43d1c8 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -252,6 +252,7 @@
false
false
+ -Xmx4g -Xms2g
2.22.0
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
index 074ab27a6..6a7b8802a 100644
--- a/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStar.kt
@@ -99,12 +99,18 @@ class ShootingStar(var level: ShootingStarType = ShootingStarType.values().rando
return ShootingStarType.values()[level.ordinal - 1]
}
+ /**
+ * Clears the current star object or sprite
+ */
+ fun clear() {
+ SceneryBuilder.remove(starObject)
+ clearSprite()
+ }
+
/**
* Fires the shooting star (spawns a new one). Only used when spawning new shooting stars, not for downgrading existing ones.
*/
fun fire() {
- SceneryBuilder.remove(starObject)
- clearSprite()
SceneryBuilder.add(starObject)
if(!isSpawned) {
(0..2).forEach {
diff --git a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
index 7368b7689..0c938aec5 100644
--- a/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
+++ b/Server/src/main/content/global/activity/shootingstar/ShootingStarPlugin.kt
@@ -17,6 +17,7 @@ import core.game.world.GameWorld
import core.tools.Log
import core.tools.secondsToTicks
import content.data.Quests
+import core.game.node.scenery.SceneryBuilder
class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Commands, StartupListener {
override fun login(player: Player) {
@@ -46,6 +47,7 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
// Check if it's time to fire a new one
if (star.ticks >= tickDelay && !star.spriteSpawned) {
+ star.clear()
star.rebuildVars()
star.fire()
}
@@ -133,11 +135,12 @@ class ShootingStarPlugin : LoginListener, InteractionListener, TickListener, Com
}
override fun defineCommands() {
- define("tostar", Privilege.ADMIN, description = "Teleports you adjacent to the currently active star.") { player, _ ->
- teleport(player, star.starObject.location.transform(1,1,0))
+ define("tostar", Privilege.ADMIN, description = "Teleports you inside the currently active star.") { player, _ ->
+ teleport(player, star.starObject.location.transform(0, 0, 0))
}
define("submit", Privilege.ADMIN, description = "Rebuilds and fires the shooting star event immediately.") { _, _ ->
+ star.clear()
star.rebuildVars()
star.fire()
}
diff --git a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt b/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt
index 5b065f567..c945d2f6e 100644
--- a/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt
+++ b/Server/src/main/content/global/ame/events/evilchicken/EvilChickenNPC.kt
@@ -8,12 +8,15 @@ import core.game.node.item.Item
import core.tools.RandomFunction
import org.rs09.consts.Items
import content.global.ame.RandomEventNPC
+import core.api.sendMessage
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
val ids = (2463..2468).toList()
class EvilChickenNPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(2463) {
val phrases = arrayOf("Bwuk","Bwuk bwuk bwuk","Flee from me, @name!","Begone, @name!","Bwaaaauuuk bwuk bwuk","MUAHAHAHAHAAA!")
+ var sentMessage = false
override fun talkTo(npc: NPC) {}
override fun init() {
@@ -31,13 +34,17 @@ class EvilChickenNPC(override var loot: WeightBasedTable? = null) : RandomEventN
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
- this.terminate()
- }
- if(getWorldTicks() % 10 == 0){
- sendChat(phrases.random().replace("@name",player.username.capitalize()))
+ if (!sentMessage) {
+ if (!player.location.withinDistance(this.location, 8)) {
+ // https://www.youtube.com/watch?v=v9p_I_Tq3JE
+ sendMessage(player, "The Evil Chicken realises you're out of range and vanishes.")
+ sentMessage = true
+ terminate()
+ }
+ if (getWorldTicks() % 10 == 0) {
+ sendChat(phrases.random().replace("@name", player.username.capitalize()))
+ }
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
}
}
diff --git a/Server/src/main/content/global/ame/events/maze/MazeInterface.kt b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt
index c3c1ab7f4..5376e870c 100644
--- a/Server/src/main/content/global/ame/events/maze/MazeInterface.kt
+++ b/Server/src/main/content/global/ame/events/maze/MazeInterface.kt
@@ -15,6 +15,7 @@ import core.game.node.entity.player.Player
import core.game.system.task.Pulse
import core.game.world.GameWorld.Pulser
import core.game.world.map.Location
+import core.game.world.map.RegionManager
import core.game.world.map.zone.ZoneBorders
import core.game.world.map.zone.ZoneRestriction
import core.game.world.update.flag.context.Graphics
@@ -109,73 +110,17 @@ class MazeInterface : InteractionListener, EventHook, MapArea {
addItemOrDrop(player, REWARD_ITEM[randomNumber], itemQuantity.toInt())
}
}
-
- /**
- * Chest Location to rotation mapping.
- * This is needed as it is impossible to obtain the underlying chest scenery for the rotation.
- * 0: Facing North, 1: Facing East, 2: Facing South, 3: Facing West
- */
- val chestLocationRotationMap = mapOf(
- Location(2930, 4595, 0).toString() to 2,
- Location(2924, 4572, 0).toString() to 2,
- Location(2925, 4573, 0).toString() to 0,
- Location(2900, 4578, 0).toString() to 2,
- Location(2901, 4560, 0).toString() to 1,
- Location(2890, 4599, 0).toString() to 2,
- Location(2896, 4591, 0).toString() to 2,
- Location(2895, 4592, 0).toString() to 1,
- Location(2901, 4560, 0).toString() to 3,
- Location(2918, 4590, 0).toString() to 1,
- Location(2917, 4590, 0).toString() to 3,
- )
-
- /**
- * Chest Interaction workaround
- *
- * The issue here is that the walls(3626) of the Maze are overlapping some(not all) chest sceneries.
- *
- * The types for the wallScenery:
- * Type 0 - flat panel |
- * Type 2 - right angle panel with rotation 0:r 1:7 2:> 3:L
- * Type 3 - corner post . for angle edges of walls
- */
- fun overrideScenery(wallScenery: core.game.node.scenery.Scenery, chestSceneryId: Int): core.game.node.scenery.Scenery {
- if (wallScenery.id == chestSceneryId) {
- replaceScenery(wallScenery, Scenery.CHEST_3636, 30)
- wallScenery.isActive = true
- return wallScenery // Return the chest scenery as the wallScenery isn't there.
- }
-
- addScenery(Scenery.CHEST_3636, wallScenery.location, chestLocationRotationMap[wallScenery.location.toString()] ?: 0, 10)
- addScenery(wallScenery)
- // replaceScenery(newChestScenery, Scenery.CHEST_3636, 3) // didn't work for an underlying scenery
- // I did a world pulse since everyone will get to see the chest open.
- Pulser.submit(object : Pulse(30) {
- override fun pulse(): Boolean {
- addScenery(Scenery.CHEST_3635, wallScenery.location, chestLocationRotationMap[wallScenery.location.toString()] ?: 0, 10)
- addScenery(wallScenery)
- return true
- }
- })
- // Return the chest scenery to replace PacketProcessor so that MISMATCH will not happen.
- return core.game.node.scenery.Scenery(
- chestSceneryId,
- wallScenery.location,
- chestLocationRotationMap[wallScenery.location.toString()] ?: 0
- )
- }
}
override fun defineListeners() {
-
- // This somehow doesn't trigger as the scenery.id != objId (3626 != 3635)
on(Scenery.CHEST_3635, IntType.SCENERY, "open") { player, node ->
+ lock(player, 3)
+ animate(player, 536)
+ replaceScenery(node.asScenery(), Scenery.CHEST_3636, 3)
if (getAttribute(player, MAZE_ATTRIBUTE_TICKS_LEFT, 0) > 0 && getAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, 0) < 10) {
- animate(player, 536)
- // val actualScenery = RegionManager.getObject(node.location.z, node.location.x, node.location.y, 3626)
val tableRoll = CHEST_REWARDS.roll()
addItemOrBank(player, tableRoll[0].id, tableRoll[0].amount)
- when (tableRoll[0].id){
+ when (tableRoll[0].id) {
Items.AIR_RUNE_556 -> sendItemDialogue(player, Items.AIR_RUNE_556, "You've found some air runes!")
Items.WATER_RUNE_555 -> sendItemDialogue(player, Items.WATER_RUNE_555, "You've found some water runes!")
Items.EARTH_RUNE_557 -> sendItemDialogue(player, Items.EARTH_RUNE_557, "You've found some earth runes!")
@@ -187,7 +132,7 @@ class MazeInterface : InteractionListener, EventHook, MapArea {
Items.STRENGTH_POTION2_117 -> sendItemDialogue(player, Items.STRENGTH_POTION2_117, "You've found a strength potion!")
Items.DEFENCE_POTION2_135 -> sendItemDialogue(player, Items.DEFENCE_POTION2_135, "You've found a defence potion!")
}
- setAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, getAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, 0))
+ setAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, getAttribute(player, MAZE_ATTRIBUTE_CHESTS_OPEN, 0) + 1)
} else {
sendMessage(player,"You find nothing of interest.")
}
diff --git a/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt b/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt
index dff28d7e9..50888b63e 100644
--- a/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt
+++ b/Server/src/main/content/global/ame/events/rivertroll/RiverTrollRENPC.kt
@@ -3,7 +3,9 @@ package content.global.ame.events.rivertroll
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import content.global.ame.RandomEventNPC
+import core.api.getWorldTicks
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
val ids = (391..396).toList()
@@ -21,10 +23,12 @@ class RiverTrollRENPC(override var loot: WeightBasedTable? = null) : RandomEvent
super.finalizeDeath(killer)
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
+ if (!player.location.withinDistance(this.location, 8)) {
this.terminate()
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
+ if (!player.location.withinDistance(this.location, MapDistance.RENDERING.distance)) {
+ this.clear()
+ }
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt b/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt
index eb3399657..68bd92beb 100644
--- a/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt
+++ b/Server/src/main/content/global/ame/events/rockgolem/RockGolemRENPC.kt
@@ -3,7 +3,9 @@ package content.global.ame.events.rockgolem
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import content.global.ame.RandomEventNPC
+import core.api.getWorldTicks
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
val ids = (413..418).toList()
@@ -21,10 +23,12 @@ class RockGolemRENPC(override var loot: WeightBasedTable? = null) : RandomEventN
super.finalizeDeath(killer)
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
+ if (!player.location.withinDistance(this.location, 8)) {
this.terminate()
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
+ if (!player.location.withinDistance(this.location, MapDistance.RENDERING.distance)) {
+ this.clear()
+ }
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt b/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt
index 60a0f57ae..14bcdd609 100644
--- a/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt
+++ b/Server/src/main/content/global/ame/events/shade/ShadeRENPC.kt
@@ -3,7 +3,9 @@ package content.global.ame.events.shade
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import content.global.ame.RandomEventNPC
+import core.api.getWorldTicks
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
class ShadeRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(425){
val ids = (425..430).toList()
@@ -20,10 +22,12 @@ class ShadeRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(4
super.finalizeDeath(killer)
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
+ if (!player.location.withinDistance(this.location, 8)) {
this.terminate()
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
+ if (!player.location.withinDistance(this.location, MapDistance.RENDERING.distance)) {
+ this.clear()
+ }
}
}
diff --git a/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt b/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt
index 3b0033972..0bba8e2b5 100644
--- a/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt
+++ b/Server/src/main/content/global/ame/events/treespirit/TreeSpiritRENPC.kt
@@ -3,7 +3,9 @@ package content.global.ame.events.treespirit
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import content.global.ame.RandomEventNPC
+import core.api.getWorldTicks
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
val ids = (438..443).toList()
@@ -21,10 +23,12 @@ class TreeSpiritRENPC(override var loot: WeightBasedTable? = null) : RandomEvent
super.finalizeDeath(killer)
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
+ if (!player.location.withinDistance(this.location, 8)) {
this.terminate()
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
+ if (!player.location.withinDistance(this.location, MapDistance.RENDERING.distance)) {
+ this.clear()
+ }
}
}
\ No newline at end of file
diff --git a/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt b/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt
index 6b43d54b4..ebe4465bc 100644
--- a/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt
+++ b/Server/src/main/content/global/ame/events/zombie/ZombieRENPC.kt
@@ -3,7 +3,9 @@ package content.global.ame.events.zombie
import core.game.node.entity.Entity
import core.game.node.entity.npc.NPC
import content.global.ame.RandomEventNPC
+import core.api.getWorldTicks
import core.api.utils.WeightBasedTable
+import core.game.world.map.MapDistance
class ZombieRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(419){
val ids = (419..424).toList()
@@ -20,10 +22,12 @@ class ZombieRENPC(override var loot: WeightBasedTable? = null) : RandomEventNPC(
super.finalizeDeath(killer)
}
override fun tick() {
- if(!player.location.withinDistance(this.location,8)){
+ if (!player.location.withinDistance(this.location, 8)) {
this.terminate()
}
super.tick()
- if(!player.viewport.currentPlane.npcs.contains(this)) this.clear()
+ if (!player.location.withinDistance(this.location, MapDistance.RENDERING.distance)) {
+ this.clear()
+ }
}
}
diff --git a/Server/src/main/content/global/bots/Adventurer.kt b/Server/src/main/content/global/bots/Adventurer.kt
index 916503945..62464bbf2 100644
--- a/Server/src/main/content/global/bots/Adventurer.kt
+++ b/Server/src/main/content/global/bots/Adventurer.kt
@@ -21,6 +21,7 @@ import core.game.bots.CombatBotAssembler
import core.game.bots.Script
import core.game.interaction.IntType
import core.game.interaction.InteractionListeners
+import core.game.world.repository.Repository
import core.tools.Log
import java.io.File
import java.io.FileReader
@@ -114,7 +115,7 @@ class Adventurer(val style: CombatStyle): Script() {
}
private fun otherPlayersNearby(): Boolean {
- val localPlayers = RegionManager.getLocalPlayers(bot)
+ val localPlayers = RegionManager.getLocalPlayers(bot.location)
val otherPlayers = localPlayers.filter { it.name != bot.name }
return otherPlayers.isNotEmpty()
}
@@ -503,7 +504,7 @@ class Adventurer(val style: CombatStyle): Script() {
dateCode == 404 -> lineAlt = dialogue.getLines("easter").rand()
}
- var localPlayers = RegionManager.getLocalPlayers(bot)
+ val localPlayers = RegionManager.getLocalPlayers(bot.location)
if (localPlayers.isNotEmpty()) {
val localPlayer = localPlayers
.filter { it.name != bot.name }
diff --git a/Server/src/main/content/global/bots/CannonballSmelter.kt b/Server/src/main/content/global/bots/CannonballSmelter.kt
index 8ac77f7e1..bc921111b 100644
--- a/Server/src/main/content/global/bots/CannonballSmelter.kt
+++ b/Server/src/main/content/global/bots/CannonballSmelter.kt
@@ -58,7 +58,7 @@ class CannonballSmelter : Script() {
} else if(!coalMine.insideBorder(bot)){
scriptAPI.walkTo(coalMine.randomLoc)
} else {
- val rock = scriptAPI.getNearestObjectByPredicate({node -> node?.name?.equals("rocks", true)!! && MiningNode.forId(node?.id!!).reward == Items.COAL_453 })
+ val rock = scriptAPI.getNearestObjectByPredicate({node -> node?.name?.equals("rocks", true)!! && MiningNode.forId(node.id)?.reward == Items.COAL_453 })
if(rock != null) {
scriptAPI.interact(bot, rock, "mine")
} else {
@@ -75,7 +75,7 @@ class CannonballSmelter : Script() {
var loc = ironMine.randomLoc
scriptAPI.walkTo(loc)
} else {
- val rock = scriptAPI.getNearestObjectByPredicate({node -> node?.name?.equals("rocks", true)!! && MiningNode.forId(node?.id!!).reward == Items.IRON_ORE_440 })
+ val rock = scriptAPI.getNearestObjectByPredicate({node -> node?.name?.equals("rocks", true)!! && MiningNode.forId(node.id)?.reward == Items.IRON_ORE_440 })
//rock?.let { InteractionListeners.run(rock.id, IntType.SCENERY,"mine",bot,rock) }
if(rock != null) {
scriptAPI.interact(bot, rock, "mine")
diff --git a/Server/src/main/content/global/bots/DoublingMoney.kt b/Server/src/main/content/global/bots/DoublingMoney.kt
index 785fd8690..8840191eb 100644
--- a/Server/src/main/content/global/bots/DoublingMoney.kt
+++ b/Server/src/main/content/global/bots/DoublingMoney.kt
@@ -22,6 +22,7 @@ import core.game.bots.Script
import core.game.interaction.IntType
import core.game.interaction.InteractionListeners
import core.game.world.ImmerseWorld
+import core.game.world.repository.Repository
import java.io.File
import java.io.FileReader
import java.util.Random
@@ -262,10 +263,12 @@ class DoublingMoney : Script() {
minDist = min(minDist, loc.getDistance(bot.location))
}
if (minDist > 1) return 2
- RegionManager.forId(bot.location.regionId).planes[bot.location.z].players.forEach {
- if (AIRepository.PulseRepository[it?.username?.lowercase()]?.botScript is DoublingMoney
- && it != bot
- && it.location.getDistance(bot.location) <= 1) {
+ val region = RegionManager.forId(bot.location.regionId)
+ val players = region.assemblePlayerList(bot.location.z)
+ for (player in players) {
+ if (AIRepository.PulseRepository[player.username.lowercase()]?.botScript is DoublingMoney
+ && player != bot
+ && player.location.getDistance(bot.location) <= 1) {
return 2
}
}
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
index b3e276dcd..08b180396 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ChainhitSpecialHandler.java
@@ -79,7 +79,7 @@ public final class ChainhitSpecialHandler extends RangeSwingHandler implements P
if (!((Player) entity).getSettings().drainSpecial(SPECIAL_ENERGY)) {
return -1;
}
- state.setStyle(CombatStyle.RANGE);
+ state.setStyle(CombatStyle.RANGE);
if (victim instanceof NPC) {
NPC npc = victim.asNpc();
if (npc.getId() == 2440) {
@@ -186,9 +186,9 @@ public final class ChainhitSpecialHandler extends RangeSwingHandler implements P
if (list == null) {
int distance = 5;
if (victim instanceof NPC) {
- e.setAttribute("chain-hit_v", list = RegionManager.getLocalNpcs(e, distance));
+ e.setAttribute("chain-hit_v", list = RegionManager.getLocalNPCs(e.getLocation(), distance));
} else {
- e.setAttribute("chain-hit_v", list = RegionManager.getLocalPlayers(e, distance));
+ e.setAttribute("chain-hit_v", list = RegionManager.getLocalPlayers(e.getLocation(), distance));
}
list.remove(e);
list.remove(victim);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
index a0801835e..0523f8753 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/ChinchompaSwingHandler.java
@@ -13,7 +13,6 @@ import core.game.world.map.RegionManager;
import core.game.world.update.flag.context.Graphics;
import core.tools.RandomFunction;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -56,14 +55,18 @@ public final class ChinchompaSwingHandler extends RangeSwingHandler {
return -1;
}
- // ! Initial capacity of 14, but has dynamic size? i.e. we are not restricting to a max of 14 targets hit here now
- List targetCandidates = new ArrayList<>(14);
- targetCandidates.addAll(RegionManager.getSurroundingNPCs(victim, 14, entity));
- targetCandidates.addAll(RegionManager.getSurroundingPlayers(victim, 14, entity));
+ // https://oldschool.runescape.wiki/w/Chinchompa - shit source but it's better than what was here before
+ @SuppressWarnings("rawtypes") List targetCandidates;
+ if (victim instanceof Player) {
+ targetCandidates = RegionManager.getSurroundingPlayers(victim, 9);
+ } else {
+ targetCandidates = RegionManager.getSurroundingNPCs(victim, 11);
+ }
BattleState[] targets = new BattleState[targetCandidates.size()];
int count = 0;
- for (Entity e : targetCandidates) {
- if (canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
+ for (Object o : targetCandidates) {
+ Entity e = (Entity) o;
+ if (e != entity && canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
BattleState s = targets[count++] = new BattleState(entity, e);
s.setStyle(CombatStyle.RANGE);
int hit = 0;
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
index ba3ff8ed0..0b09a3c2c 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/PowerstabSpecialHandler.java
@@ -76,12 +76,12 @@ public final class PowerstabSpecialHandler extends MeleeSwingHandler implements
return super.swing(entity, victim, state);
}
@SuppressWarnings("rawtypes")
- List list = victim instanceof NPC ? RegionManager.getSurroundingNPCs(entity, 9, entity) : RegionManager.getSurroundingPlayers(entity, 9, entity);
+ List list = victim instanceof NPC ? RegionManager.getSurroundingNPCs(entity, 9) : RegionManager.getSurroundingPlayers(entity, 9);
BattleState[] targets = new BattleState[list.size()];
int count = 0;
for (Object o : list) {
Entity e = (Entity) o;
- if (CombatStyle.RANGE.getSwingHandler().canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
+ if (e != entity && CombatStyle.RANGE.getSwingHandler().canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
BattleState s = targets[count++] = new BattleState(entity, e);
int hit = 0;
if (isAccurateImpact(entity, e)) {
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
index 2595b0479..4ae69ddc2 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SpearWallSpecialHandler.java
@@ -77,12 +77,12 @@ public final class SpearWallSpecialHandler extends MeleeSwingHandler implements
return super.swing(entity, victim, state);
}
@SuppressWarnings("rawtypes")
- List list = victim instanceof NPC ? RegionManager.getSurroundingNPCs(entity, 9, entity) : RegionManager.getSurroundingPlayers(entity, 9, entity);
+ List list = victim instanceof NPC ? RegionManager.getSurroundingNPCs(entity, 9) : RegionManager.getSurroundingPlayers(entity, 9);
BattleState[] targets = new BattleState[list.size()];
int count = 0;
for (Object o : list) {
Entity e = (Entity) o;
- if (CombatStyle.RANGE.getSwingHandler().canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
+ if (e != entity && CombatStyle.RANGE.getSwingHandler().canSwing(entity, e) != InteractionType.NO_INTERACT && e.isAttackable(entity, CombatStyle.RANGE, false)) {
BattleState s = targets[count++] = new BattleState(entity, e);
int hit = 0;
hit = RandomFunction.random(calculateHit(entity, e, 1.0) + 1);
diff --git a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
index 6c4b9cedc..c51e3532e 100644
--- a/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
+++ b/Server/src/main/content/global/handlers/item/equipment/special/SweepSpecialHandler.java
@@ -2,7 +2,9 @@ package content.global.handlers.item.equipment.special;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import core.game.world.repository.Repository;
import core.plugin.Initializable;
import content.global.skill.summoning.familiar.Familiar;
import core.game.node.entity.Entity;
@@ -98,7 +100,10 @@ public final class SweepSpecialHandler extends MeleeSwingHandler implements Plug
Direction dir = Direction.getDirection(x - entity.getLocation().getX(), y - entity.getLocation().getY());
List l = new ArrayList<>(20);
l.add(new BattleState(entity, victim));
- for (Entity n : victim instanceof NPC ? RegionManager.getSurroundingNPCs(victim, 9, entity, victim) : RegionManager.getSurroundingPlayers(victim, 9, entity, victim)) {
+ for (Entity n : victim instanceof NPC ? RegionManager.getSurroundingNPCs(victim, 9) : RegionManager.getSurroundingPlayers(victim, 9)) {
+ if (n == entity) {
+ continue;
+ }
if (n instanceof Familiar) {
continue;
}
diff --git a/Server/src/main/content/global/handlers/item/withitem/SoftclayPlugin.java b/Server/src/main/content/global/handlers/item/withitem/SoftclayPlugin.java
index 37ff46584..fc63daa34 100644
--- a/Server/src/main/content/global/handlers/item/withitem/SoftclayPlugin.java
+++ b/Server/src/main/content/global/handlers/item/withitem/SoftclayPlugin.java
@@ -21,47 +21,47 @@ import java.util.Objects;
@Initializable
public final class SoftclayPlugin extends UseWithHandler {
- /**
- * Represents the clay item.
- */
- private static final Item CLAY = new Item(Items.CLAY_434);
+ /**
+ * Represents the clay item.
+ */
+ private static final Item CLAY = new Item(Items.CLAY_434);
- /**
- * Represents the soft clay item.
- */
- private static final Item SOFT_CLAY = new Item(Items.SOFT_CLAY_1761);
+ /**
+ * Represents the soft clay item.
+ */
+ private static final Item SOFT_CLAY = new Item(Items.SOFT_CLAY_1761);
- /**
- * Represents the bowl of water item.
- */
- private static final Item BOWL_OF_WATER = new Item(Items.BOWL_OF_WATER_1921);
+ /**
+ * Represents the bowl of water item.
+ */
+ private static final Item BOWL_OF_WATER = new Item(Items.BOWL_OF_WATER_1921);
- /**
- * Represents the empty bowl item.
- */
- private static final Item BOWL = new Item(Items.BOWL_1923);
+ /**
+ * Represents the empty bowl item.
+ */
+ private static final Item BOWL = new Item(Items.BOWL_1923);
- /**
- * Represents the empty bucket item.
- */
- private static final Item BUCKET = new Item(Items.BUCKET_1925);
+ /**
+ * Represents the empty bucket item.
+ */
+ private static final Item BUCKET = new Item(Items.BUCKET_1925);
/**
* Represents the bucket of water item.
*/
private static final Item BUCKET_OF_WATER = new Item(Items.BUCKET_OF_WATER_1929);
- /**
- * Represents the jug item.
- */
- private static final Item JUG = new Item(Items.JUG_1935);
+ /**
+ * Represents the jug item.
+ */
+ private static final Item JUG = new Item(Items.JUG_1935);
/**
* Represents the jug of water item.
*/
private static final Item JUG_OF_WATER = new Item(Items.JUG_OF_WATER_1937);
- /**
+ /**
* Constructs a new {@code SoftclayPlugin} {@code Object}.
*/
public SoftclayPlugin() {
@@ -70,7 +70,7 @@ public final class SoftclayPlugin extends UseWithHandler {
@Override
public Plugin