PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-20 02:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixafewthings

Browse source
This commit is contained in:
ScrawnyRonnie 2023-11-12 07:48:50 -05:00
parent 5930e7fb76
commit 0c3d5f3601
9 changed files with 151 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main/resources/zonemaps/ugd01.json
View file

@ -10598,27 +10598,27 @@
"Id": 291,
"ObjectName": "vanu_equipment_term_200000",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 788.95,
"AbsY": 883.67,
"AbsZ": 109.24,
"Yaw": 72.0,
"GUID": 837,
"MapID": 200000,
"IsChildObject": false
"IsChildObject": true
},
{
"Id": 292,
"ObjectName": "vanu_equipment_term_200001",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 797.79,
"AbsY": 881.34,
"AbsZ": 109.24,
"Yaw": 256.0,
"GUID": 838,
"MapID": 200001,
"IsChildObject": false
"IsChildObject": true
},
{
"Id": 35,
@ -10650,7 +10650,7 @@
"Id": 293,
"ObjectName": "vanu_equipment_term_200002",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 835.0,
"AbsY": 1015.28,
"AbsZ": 92.77,
@ -10663,7 +10663,7 @@
"Id": 294,
"ObjectName": "vanu_equipment_term_200003",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 843.21,
"AbsY": 1012.32,
"AbsZ": 92.77,
@ -10754,7 +10754,7 @@
"Id": 366,
"ObjectName": "vanu_equipment_term_200065",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 924.69,
"AbsY": 1345.47,
"AbsZ": 162.79,
@ -10767,7 +10767,7 @@
"Id": 365,
"ObjectName": "vanu_equipment_term_200064",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 955.27,
"AbsY": 1345.54,
"AbsZ": 162.79,
@ -10897,7 +10897,7 @@
"Id": 296,
"ObjectName": "vanu_equipment_term_200005",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1042.81,
"AbsY": 1333.65,
"AbsZ": 96.39,
@ -10910,7 +10910,7 @@
"Id": 303,
"ObjectName": "vanu_equipment_term_200012",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1197.72,
"AbsY": 1034.24,
"AbsZ": 99.62,
@ -10923,7 +10923,7 @@
"Id": 304,
"ObjectName": "vanu_equipment_term_200013",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1206.08,
"AbsY": 1036.35,
"AbsZ": 99.62,
@ -11040,7 +11040,7 @@
"Id": 302,
"ObjectName": "vanu_equipment_term_200011",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1369.5,
"AbsY": 1032.42,
"AbsZ": 165.16,
@ -11053,7 +11053,7 @@
"Id": 301,
"ObjectName": "vanu_equipment_term_200010",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1380.5,
"AbsY": 1019.15,
"AbsZ": 165.16,
@ -11144,7 +11144,7 @@
"Id": 300,
"ObjectName": "vanu_equipment_term_200009",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1447.85,
"AbsY": 1272.05,
"AbsZ": 94.15,
@ -11157,7 +11157,7 @@
"Id": 299,
"ObjectName": "vanu_equipment_term_200008",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1451.55,
"AbsY": 1282.54,
"AbsZ": 94.15,
@ -11196,7 +11196,7 @@
"Id": 297,
"ObjectName": "vanu_equipment_term_200006",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1513.39,
"AbsY": 1453.92,
"AbsZ": 105.26,
@ -11209,7 +11209,7 @@
"Id": 298,
"ObjectName": "vanu_equipment_term_200007",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 53,
"AbsX": 1532.47,
"AbsY": 1434.84,
"AbsZ": 105.26,

84
src/main/resources/zonemaps/ugd02.json
View file

@ -17475,7 +17475,7 @@
"Id": 680,
"ObjectName": "vanu_equipment_term_200148",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 698.33,
"AbsY": 1305.7,
"AbsZ": 275.21,
@ -17488,7 +17488,7 @@
"Id": 679,
"ObjectName": "vanu_equipment_term_200147",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 698.58,
"AbsY": 1315.74,
"AbsZ": 275.19,
@ -17501,7 +17501,7 @@
"Id": 328,
"ObjectName": "vanu_equipment_term_200014",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 708.04,
"AbsY": 1316.01,
"AbsZ": 269.6,
@ -17514,7 +17514,7 @@
"Id": 465,
"ObjectName": "vanu_equipment_term_200041",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 712.63,
"AbsY": 1027.1,
"AbsZ": 208.95,
@ -17527,7 +17527,7 @@
"Id": 466,
"ObjectName": "vanu_equipment_term_200042",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 780.39,
"AbsY": 1449.89,
"AbsZ": 221.48,
@ -17540,7 +17540,7 @@
"Id": 326,
"ObjectName": "vanu_equipment_term_200012",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 781.96,
"AbsY": 1183.78,
"AbsZ": 295.04,
@ -17553,7 +17553,7 @@
"Id": 493,
"ObjectName": "vanu_equipment_term_200066",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 793.93,
"AbsY": 893.29,
"AbsZ": 258.11,
@ -17566,7 +17566,7 @@
"Id": 677,
"ObjectName": "vanu_equipment_term_200145",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 796.12,
"AbsY": 1214.87,
"AbsZ": 216.88,
@ -17579,7 +17579,7 @@
"Id": 492,
"ObjectName": "vanu_equipment_term_200065",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 796.38,
"AbsY": 888.05,
"AbsZ": 258.11,
@ -17592,7 +17592,7 @@
"Id": 313,
"ObjectName": "vanu_equipment_term_200001",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 811.1,
"AbsY": 1040.67,
"AbsZ": 217.19,
@ -17605,7 +17605,7 @@
"Id": 678,
"ObjectName": "vanu_equipment_term_200146",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 818.56,
"AbsY": 1196.84,
"AbsZ": 216.87,
@ -17657,7 +17657,7 @@
"Id": 404,
"ObjectName": "vanu_equipment_term_200035",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 874.34,
"AbsY": 529.76,
"AbsZ": 223.56,
@ -17670,7 +17670,7 @@
"Id": 321,
"ObjectName": "vanu_equipment_term_200008",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 874.43,
"AbsY": 541.76,
"AbsZ": 223.6,
@ -17683,7 +17683,7 @@
"Id": 396,
"ObjectName": "vanu_equipment_term_200030",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 878.58,
"AbsY": 714.85,
"AbsZ": 245.64,
@ -17709,7 +17709,7 @@
"Id": 395,
"ObjectName": "vanu_equipment_term_200029",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 885.9,
"AbsY": 718.47,
"AbsZ": 245.59,
@ -17722,7 +17722,7 @@
"Id": 397,
"ObjectName": "vanu_equipment_term_200031",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 886.9,
"AbsY": 719.18,
"AbsZ": 240.1,
@ -17735,7 +17735,7 @@
"Id": 325,
"ObjectName": "vanu_equipment_term_200011",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 892.74,
"AbsY": 1062.22,
"AbsZ": 306.95,
@ -17774,7 +17774,7 @@
"Id": 314,
"ObjectName": "vanu_equipment_term_200002",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 901.22,
"AbsY": 968.3,
"AbsZ": 228.56,
@ -17891,7 +17891,7 @@
"Id": 669,
"ObjectName": "vanu_equipment_term_200139",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 960.27,
"AbsY": 1312.18,
"AbsZ": 314.7,
@ -17904,7 +17904,7 @@
"Id": 670,
"ObjectName": "vanu_equipment_term_200140",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 960.85,
"AbsY": 1316.61,
"AbsZ": 320.2,
@ -17917,7 +17917,7 @@
"Id": 716,
"ObjectName": "vanu_equipment_term_200155",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 992.3,
"AbsY": 1296.21,
"AbsZ": 228.93,
@ -17930,7 +17930,7 @@
"Id": 668,
"ObjectName": "vanu_equipment_term_200138",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1052.35,
"AbsY": 1589.94,
"AbsZ": 277.2,
@ -17943,7 +17943,7 @@
"Id": 667,
"ObjectName": "vanu_equipment_term_200137",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1052.45,
"AbsY": 1579.18,
"AbsZ": 277.16,
@ -17956,7 +17956,7 @@
"Id": 663,
"ObjectName": "vanu_equipment_term_200133",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1061.86,
"AbsY": 1589.88,
"AbsZ": 271.7,
@ -17969,7 +17969,7 @@
"Id": 323,
"ObjectName": "vanu_equipment_term_200010",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1148.93,
"AbsY": 1280.05,
"AbsZ": 309.5,
@ -17982,7 +17982,7 @@
"Id": 383,
"ObjectName": "vanu_equipment_term_200024",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1177.01,
"AbsY": 1655.31,
"AbsZ": 264.53,
@ -17995,7 +17995,7 @@
"Id": 384,
"ObjectName": "vanu_equipment_term_200025",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1179.59,
"AbsY": 1657.89,
"AbsZ": 264.54,
@ -18008,7 +18008,7 @@
"Id": 476,
"ObjectName": "vanu_equipment_term_200049",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1191.35,
"AbsY": 1350.39,
"AbsZ": 231.43,
@ -18021,7 +18021,7 @@
"Id": 671,
"ObjectName": "vanu_equipment_term_200141",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1211.49,
"AbsY": 1310.12,
"AbsZ": 297.49,
@ -18034,7 +18034,7 @@
"Id": 477,
"ObjectName": "vanu_equipment_term_200050",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1211.81,
"AbsY": 1370.72,
"AbsZ": 231.41,
@ -18047,7 +18047,7 @@
"Id": 479,
"ObjectName": "vanu_equipment_term_200052",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1246.72,
"AbsY": 1328.41,
"AbsZ": 241.55,
@ -18060,7 +18060,7 @@
"Id": 478,
"ObjectName": "vanu_equipment_term_200051",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1259.03,
"AbsY": 1323.69,
"AbsZ": 241.59,
@ -18099,7 +18099,7 @@
"Id": 319,
"ObjectName": "vanu_equipment_term_200006",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1261.61,
"AbsY": 1348.42,
"AbsZ": 241.57,
@ -18268,7 +18268,7 @@
"Id": 633,
"ObjectName": "vanu_equipment_term_200104",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1332.57,
"AbsY": 907.17,
"AbsZ": 304.92,
@ -18281,7 +18281,7 @@
"Id": 322,
"ObjectName": "vanu_equipment_term_200009",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1334.08,
"AbsY": 903.35,
"AbsZ": 299.39,
@ -18294,7 +18294,7 @@
"Id": 653,
"ObjectName": "vanu_equipment_term_200124",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1360.28,
"AbsY": 1340.27,
"AbsZ": 301.92,
@ -18307,7 +18307,7 @@
"Id": 654,
"ObjectName": "vanu_equipment_term_200125",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1360.38,
"AbsY": 1313.07,
"AbsZ": 301.94,
@ -18320,7 +18320,7 @@
"Id": 661,
"ObjectName": "vanu_equipment_term_200132",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1366.18,
"AbsY": 1468.81,
"AbsZ": 264.11,
@ -18333,7 +18333,7 @@
"Id": 660,
"ObjectName": "vanu_equipment_term_200131",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1366.43,
"AbsY": 1457.77,
"AbsZ": 264.13,
@ -18346,7 +18346,7 @@
"Id": 487,
"ObjectName": "vanu_equipment_term_200060",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1373.3,
"AbsY": 957.15,
"AbsZ": 224.99,
@ -18359,7 +18359,7 @@
"Id": 488,
"ObjectName": "vanu_equipment_term_200061",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1378.62,
"AbsY": 966.06,
"AbsZ": 225.05,
@ -18372,7 +18372,7 @@
"Id": 312,
"ObjectName": "vanu_equipment_term_200000",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 9,
"AbsX": 1380.3,
"AbsY": 1313.42,
"AbsZ": 301.87,

54
src/main/resources/zonemaps/ugd03.json
View file

@ -13263,7 +13263,7 @@
"Id": 413,
"ObjectName": "vanu_equipment_term_200058",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 624.28,
"AbsY": 958.12,
"AbsZ": 74.56,
@ -13276,7 +13276,7 @@
"Id": 414,
"ObjectName": "vanu_equipment_term_200059",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 624.38,
"AbsY": 975.77,
"AbsZ": 74.56,
@ -13289,7 +13289,7 @@
"Id": 434,
"ObjectName": "vanu_equipment_term_200071",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 634.07,
"AbsY": 835.13,
"AbsZ": 80.36,
@ -13302,7 +13302,7 @@
"Id": 435,
"ObjectName": "vanu_equipment_term_200072",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 647.92,
"AbsY": 794.89,
"AbsZ": 80.36,
@ -13419,7 +13419,7 @@
"Id": 275,
"ObjectName": "vanu_equipment_term_200019",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 684.98,
"AbsY": 878.61,
"AbsZ": 107.18,
@ -13432,7 +13432,7 @@
"Id": 265,
"ObjectName": "vanu_equipment_term_200011",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 689.91,
"AbsY": 646.49,
"AbsZ": 76.69,
@ -13445,7 +13445,7 @@
"Id": 399,
"ObjectName": "vanu_equipment_term_200045",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 704.82,
"AbsY": 1254.2,
"AbsZ": 88.18,
@ -13458,7 +13458,7 @@
"Id": 398,
"ObjectName": "vanu_equipment_term_200044",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 710.23,
"AbsY": 1277.36,
"AbsZ": 88.11,
@ -13497,7 +13497,7 @@
"Id": 433,
"ObjectName": "vanu_equipment_term_200070",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 719.63,
"AbsY": 809.77,
"AbsZ": 91.26,
@ -13536,7 +13536,7 @@
"Id": 353,
"ObjectName": "vanu_equipment_term_200030",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 769.95,
"AbsY": 1078.39,
"AbsZ": 99.83,
@ -13549,7 +13549,7 @@
"Id": 352,
"ObjectName": "vanu_equipment_term_200029",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 788.59,
"AbsY": 1093.02,
"AbsZ": 99.81,
@ -13588,7 +13588,7 @@
"Id": 276,
"ObjectName": "vanu_equipment_term_200020",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 844.02,
"AbsY": 778.6,
"AbsZ": 106.01,
@ -13601,7 +13601,7 @@
"Id": 463,
"ObjectName": "vanu_equipment_term_200080",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 846.68,
"AbsY": 782.07,
"AbsZ": 111.52,
@ -13614,7 +13614,7 @@
"Id": 402,
"ObjectName": "vanu_equipment_term_200048",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 892.74,
"AbsY": 1362.69,
"AbsZ": 43.29,
@ -13627,7 +13627,7 @@
"Id": 360,
"ObjectName": "vanu_equipment_term_200037",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 901.96,
"AbsY": 911.49,
"AbsZ": 110.81,
@ -13640,7 +13640,7 @@
"Id": 403,
"ObjectName": "vanu_equipment_term_200049",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 913.09,
"AbsY": 1382.92,
"AbsZ": 43.27,
@ -13653,7 +13653,7 @@
"Id": 270,
"ObjectName": "vanu_equipment_term_200015",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 931.79,
"AbsY": 694.1,
"AbsZ": 81.75,
@ -13666,7 +13666,7 @@
"Id": 359,
"ObjectName": "vanu_equipment_term_200036",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 939.31,
"AbsY": 922.44,
"AbsZ": 110.81,
@ -13679,7 +13679,7 @@
"Id": 251,
"ObjectName": "vanu_equipment_term_200004",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 965.76,
"AbsY": 756.59,
"AbsZ": 85.54,
@ -13692,7 +13692,7 @@
"Id": 186,
"ObjectName": "vanu_equipment_term_200000",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 970.27,
"AbsY": 1330.25,
"AbsZ": 72.43,
@ -13705,7 +13705,7 @@
"Id": 406,
"ObjectName": "vanu_equipment_term_200051",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1044.21,
"AbsY": 1256.84,
"AbsZ": 72.9,
@ -13718,7 +13718,7 @@
"Id": 405,
"ObjectName": "vanu_equipment_term_200050",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1064.8,
"AbsY": 1236.89,
"AbsZ": 72.91,
@ -13731,7 +13731,7 @@
"Id": 253,
"ObjectName": "vanu_equipment_term_200006",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1134.99,
"AbsY": 739.94,
"AbsZ": 107.09,
@ -13744,7 +13744,7 @@
"Id": 257,
"ObjectName": "vanu_equipment_term_200010",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1226.99,
"AbsY": 1239.0,
"AbsZ": 96.63,
@ -13757,7 +13757,7 @@
"Id": 256,
"ObjectName": "vanu_equipment_term_200009",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1239.95,
"AbsY": 1091.6,
"AbsZ": 109.43,
@ -13900,7 +13900,7 @@
"Id": 437,
"ObjectName": "vanu_equipment_term_200073",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1362.64,
"AbsY": 657.92,
"AbsZ": 88.17,
@ -13926,7 +13926,7 @@
"Id": 271,
"ObjectName": "vanu_equipment_term_200016",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 69,
"AbsX": 1388.46,
"AbsY": 1124.9,
"AbsZ": 122.73,

32
src/main/resources/zonemaps/ugd04.json
View file

@ -10650,7 +10650,7 @@
"Id": 298,
"ObjectName": "vanu_equipment_term_200038",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 791.15,
"AbsY": 1304.88,
"AbsZ": 162.68,
@ -10689,7 +10689,7 @@
"Id": 297,
"ObjectName": "vanu_equipment_term_200037",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 799.83,
"AbsY": 1295.35,
"AbsZ": 162.68,
@ -10702,7 +10702,7 @@
"Id": 136,
"ObjectName": "vanu_equipment_term_200000",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 835.57,
"AbsY": 1094.07,
"AbsZ": 193.71,
@ -10715,7 +10715,7 @@
"Id": 137,
"ObjectName": "vanu_equipment_term_200001",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 845.78,
"AbsY": 1062.0,
"AbsZ": 193.71,
@ -10728,7 +10728,7 @@
"Id": 292,
"ObjectName": "vanu_equipment_term_200036",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 891.69,
"AbsY": 781.33,
"AbsZ": 118.5,
@ -10741,7 +10741,7 @@
"Id": 291,
"ObjectName": "vanu_equipment_term_200035",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 892.08,
"AbsY": 790.5,
"AbsZ": 118.5,
@ -10832,7 +10832,7 @@
"Id": 138,
"ObjectName": "vanu_equipment_term_200002",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1046.56,
"AbsY": 1319.12,
"AbsZ": 116.4,
@ -10845,7 +10845,7 @@
"Id": 139,
"ObjectName": "vanu_equipment_term_200003",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1048.6,
"AbsY": 1352.78,
"AbsZ": 116.4,
@ -10858,7 +10858,7 @@
"Id": 348,
"ObjectName": "vanu_equipment_term_200049",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1085.88,
"AbsY": 680.98,
"AbsZ": 116.8,
@ -10871,7 +10871,7 @@
"Id": 347,
"ObjectName": "vanu_equipment_term_200048",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1088.05,
"AbsY": 714.6,
"AbsZ": 116.8,
@ -10884,7 +10884,7 @@
"Id": 241,
"ObjectName": "vanu_equipment_term_200029",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1147.46,
"AbsY": 1067.68,
"AbsZ": 198.82,
@ -10897,7 +10897,7 @@
"Id": 242,
"ObjectName": "vanu_equipment_term_200030",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1171.04,
"AbsY": 1053.54,
"AbsZ": 198.82,
@ -11040,7 +11040,7 @@
"Id": 143,
"ObjectName": "vanu_equipment_term_200007",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1361.59,
"AbsY": 876.44,
"AbsZ": 121.5,
@ -11053,7 +11053,7 @@
"Id": 142,
"ObjectName": "vanu_equipment_term_200006",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1374.98,
"AbsY": 865.79,
"AbsZ": 121.5,
@ -11066,7 +11066,7 @@
"Id": 284,
"ObjectName": "vanu_equipment_term_200034",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1421.6,
"AbsY": 1202.05,
"AbsZ": 130.8,
@ -11079,7 +11079,7 @@
"Id": 283,
"ObjectName": "vanu_equipment_term_200033",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1430.67,
"AbsY": 1192.45,
"AbsZ": 130.8,

34
src/main/resources/zonemaps/ugd05.json
View file

@ -7270,7 +7270,7 @@
"Id": 277,
"ObjectName": "vanu_equipment_term_200023",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 941.54,
"AbsY": 850.15,
"AbsZ": 189.36,
@ -7283,7 +7283,7 @@
"Id": 267,
"ObjectName": "vanu_equipment_term_200013",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 945.16,
"AbsY": 843.7,
"AbsZ": 183.9,
@ -7296,7 +7296,7 @@
"Id": 265,
"ObjectName": "vanu_equipment_term_200011",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 950.41,
"AbsY": 852.49,
"AbsZ": 178.37,
@ -7309,7 +7309,7 @@
"Id": 264,
"ObjectName": "vanu_equipment_term_200010",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 953.54,
"AbsY": 844.73,
"AbsZ": 178.41,
@ -7335,7 +7335,7 @@
"Id": 263,
"ObjectName": "vanu_equipment_term_200009",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 956.79,
"AbsY": 837.39,
"AbsZ": 178.38,
@ -7348,7 +7348,7 @@
"Id": 266,
"ObjectName": "vanu_equipment_term_200012",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 963.51,
"AbsY": 855.72,
"AbsZ": 183.88,
@ -7361,7 +7361,7 @@
"Id": 276,
"ObjectName": "vanu_equipment_term_200022",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 967.12,
"AbsY": 849.74,
"AbsZ": 189.34,
@ -7374,7 +7374,7 @@
"Id": 281,
"ObjectName": "vanu_equipment_term_200026",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 979.19,
"AbsY": 862.66,
"AbsZ": 241.45,
@ -7387,7 +7387,7 @@
"Id": 282,
"ObjectName": "vanu_equipment_term_200027",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 979.19,
"AbsY": 873.02,
"AbsZ": 241.48,
@ -7426,7 +7426,7 @@
"Id": 280,
"ObjectName": "vanu_equipment_term_200025",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 989.0,
"AbsY": 872.94,
"AbsZ": 235.95,
@ -7517,7 +7517,7 @@
"Id": 231,
"ObjectName": "vanu_equipment_term_200002",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1008.85,
"AbsY": 1236.36,
"AbsZ": 246.4,
@ -7530,7 +7530,7 @@
"Id": 284,
"ObjectName": "vanu_equipment_term_200029",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1057.9,
"AbsY": 849.87,
"AbsZ": 253.23,
@ -7543,7 +7543,7 @@
"Id": 283,
"ObjectName": "vanu_equipment_term_200028",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1076.5,
"AbsY": 869.5,
"AbsZ": 253.22,
@ -7556,7 +7556,7 @@
"Id": 289,
"ObjectName": "vanu_equipment_term_200034",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1113.28,
"AbsY": 798.92,
"AbsZ": 197.92,
@ -7595,7 +7595,7 @@
"Id": 290,
"ObjectName": "vanu_equipment_term_200035",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1144.35,
"AbsY": 798.89,
"AbsZ": 197.92,
@ -7634,7 +7634,7 @@
"Id": 287,
"ObjectName": "vanu_equipment_term_200032",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1187.06,
"AbsY": 1054.3,
"AbsZ": 230.13,
@ -7647,7 +7647,7 @@
"Id": 288,
"ObjectName": "vanu_equipment_term_200033",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1207.07,
"AbsY": 1027.25,
"AbsZ": 230.13,

40
src/main/resources/zonemaps/ugd06.json
View file

@ -10312,7 +10312,7 @@
"Id": 174,
"ObjectName": "vanu_equipment_term_200008",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 867.18,
"AbsY": 1080.28,
"AbsZ": 89.45,
@ -10325,7 +10325,7 @@
"Id": 175,
"ObjectName": "vanu_equipment_term_200009",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 871.23,
"AbsY": 1068.0,
"AbsZ": 89.45,
@ -10338,7 +10338,7 @@
"Id": 343,
"ObjectName": "vanu_equipment_term_200056",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 873.46,
"AbsY": 1273.87,
"AbsZ": 100.52,
@ -10351,7 +10351,7 @@
"Id": 342,
"ObjectName": "vanu_equipment_term_200055",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 877.77,
"AbsY": 1276.37,
"AbsZ": 100.52,
@ -10416,7 +10416,7 @@
"Id": 172,
"ObjectName": "vanu_equipment_term_200006",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 901.33,
"AbsY": 949.3,
"AbsZ": 176.04,
@ -10481,7 +10481,7 @@
"Id": 173,
"ObjectName": "vanu_equipment_term_200007",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 919.88,
"AbsY": 968.41,
"AbsZ": 176.04,
@ -10494,7 +10494,7 @@
"Id": 178,
"ObjectName": "vanu_equipment_term_200012",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 968.73,
"AbsY": 1210.66,
"AbsZ": 179.41,
@ -10507,7 +10507,7 @@
"Id": 179,
"ObjectName": "vanu_equipment_term_200013",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 974.72,
"AbsY": 1169.48,
"AbsZ": 179.41,
@ -10520,7 +10520,7 @@
"Id": 177,
"ObjectName": "vanu_equipment_term_200011",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 996.15,
"AbsY": 1132.13,
"AbsZ": 97.47,
@ -10533,7 +10533,7 @@
"Id": 176,
"ObjectName": "vanu_equipment_term_200010",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1007.58,
"AbsY": 1125.96,
"AbsZ": 91.97,
@ -10546,7 +10546,7 @@
"Id": 167,
"ObjectName": "vanu_equipment_term_200001",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1015.53,
"AbsY": 643.92,
"AbsZ": 94.56,
@ -10559,7 +10559,7 @@
"Id": 168,
"ObjectName": "vanu_equipment_term_200002",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1048.62,
"AbsY": 890.34,
"AbsZ": 92.65,
@ -10572,7 +10572,7 @@
"Id": 166,
"ObjectName": "vanu_equipment_term_200000",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1050.16,
"AbsY": 654.59,
"AbsZ": 94.56,
@ -10585,7 +10585,7 @@
"Id": 169,
"ObjectName": "vanu_equipment_term_200003",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1075.73,
"AbsY": 880.84,
"AbsZ": 92.65,
@ -10702,7 +10702,7 @@
"Id": 219,
"ObjectName": "vanu_equipment_term_200039",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1193.54,
"AbsY": 969.01,
"AbsZ": 167.4,
@ -10715,7 +10715,7 @@
"Id": 218,
"ObjectName": "vanu_equipment_term_200038",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1198.76,
"AbsY": 961.62,
"AbsZ": 167.4,
@ -10728,7 +10728,7 @@
"Id": 340,
"ObjectName": "vanu_equipment_term_200053",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1207.29,
"AbsY": 837.52,
"AbsZ": 116.64,
@ -10741,7 +10741,7 @@
"Id": 341,
"ObjectName": "vanu_equipment_term_200054",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1207.35,
"AbsY": 868.13,
"AbsZ": 116.64,
@ -10819,7 +10819,7 @@
"Id": 170,
"ObjectName": "vanu_equipment_term_200004",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1263.08,
"AbsY": 997.75,
"AbsZ": 100.83,
@ -10832,7 +10832,7 @@
"Id": 171,
"ObjectName": "vanu_equipment_term_200005",
"ObjectType": "vanu_equipment_term",
"Owner": null,
"Owner": 0,
"AbsX": 1263.42,
"AbsY": 1014.84,
"AbsZ": 100.83,

3
src/main/scala/net/psforever/actors/session/support/SessionData.scala
View file

@ -1395,7 +1395,8 @@ class SessionData(
case Some(item) =>
sendUseGeneralEntityMessage(terminal, item)
case None
if terminal.Owner == Building.NoBuilding || terminal.Faction == player.Faction || terminal.HackedBy.nonEmpty =>
if terminal.Owner == Building.NoBuilding || terminal.Faction == player.Faction ||
terminal.HackedBy.nonEmpty || terminal.Faction == PlanetSideEmpire.NEUTRAL =>
val tdef = terminal.Definition
if (tdef.isInstanceOf[MatrixTerminalDefinition]) {
//TODO matrix spawn point; for now, just blindly bind to show work (and hope nothing breaks)

4
src/main/scala/net/psforever/objects/serverobject/terminals/Terminal.scala
View file

@ -7,7 +7,7 @@ import net.psforever.objects.definition.VehicleDefinition
import net.psforever.objects.serverobject.hackable.Hackable
import net.psforever.objects.serverobject.structures.Amenity
import net.psforever.packet.game.{ItemTransactionMessage, TriggeredSound}
import net.psforever.types.{PlanetSideGUID, Vector3}
import net.psforever.types.{PlanetSideEmpire, Vector3}
/**
* A server object that can be accessed for net.psforever.services and other amenities.
@ -47,7 +47,7 @@ class Terminal(tdef: TerminalDefinition) extends Amenity with Hackable {
* @return an actionable message that explains what resulted from interacting with this `Terminal`
*/
def Request(player: Player, msg: Any): Terminal.Exchange = {
if (Faction == player.Faction || HackedBy.isDefined || Owner.GUID == PlanetSideGUID(0)) {
if (Faction == player.Faction || HackedBy.isDefined || Owner.Faction == PlanetSideEmpire.NEUTRAL) {
tdef.Request(player, msg)
} else {
Terminal.NoDeal()

9
src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala
View file

@ -23,7 +23,7 @@ import net.psforever.objects.serverobject.terminals.Terminal
import net.psforever.objects.sourcing.{SourceEntry, VehicleSource}
import net.psforever.objects.vehicles._
import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult}
import net.psforever.objects.vital.{DamagingActivity, InGameActivity, ShieldCharge}
import net.psforever.objects.vital.{DamagingActivity, InGameActivity, ShieldCharge, SpawningActivity}
import net.psforever.objects.vital.environment.EnvironmentReason
import net.psforever.objects.vital.etc.SuicideReason
import net.psforever.objects.zones._
@ -128,6 +128,13 @@ class VehicleControl(vehicle: Vehicle)
mountBehavior.apply(msg)
mountCleanup(mount_point, player)
// For Issue 1133. Todo: There may be a better way to address the issue?
case Mountable.TryDismount(user, seat_num, _) if (vehicle.History.find { entry => entry.isInstanceOf[SpawningActivity] } match {
case Some(entry) if System.currentTimeMillis() - entry.time < 8500L => true
case _ => false
}) =>
sender() ! Mountable.MountMessages(user, Mountable.CanNotDismount(vehicle, seat_num))
case msg @ Mountable.TryDismount(_, seat_num, _) =>
dismountBehavior.apply(msg)
dismountCleanup(seat_num)