hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spawning all ground items + take/put item owner

Browse Source
This commit is contained in:
Vortrex
2022-10-25 22:27:35 -05:00
parent 57b4099037
commit 6cf4f337e8
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
scripts/server/item.js
View File

@@ -702,7 +702,7 @@ function dropItemCommand(command, params, client) {
* *
*/ */
function putItemCommand(command, params, client) { function putItemCommand(command, params, client) {
clearPlayerItemActionState(client); //clearPlayerItemActionState(client);
let hotBarSlot = toInteger(params); let hotBarSlot = toInteger(params);
@@ -745,6 +745,8 @@ function putItemCommand(command, params, client) {
return false; return false;
} }
clearPlayerItemActionState(client);
if (getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) { if (getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex != -1 && !isPlayerInAnyVehicle(client)) {
forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex, 0.0); forcePlayerPlayAnimation(client, getItemTypeData(getItemData(itemId).itemTypeIndex).putAnimationIndex, 0.0);
} }
@@ -2141,7 +2143,7 @@ function cacheAllGroundItems() {
function createAllGroundItemObjects() { function createAllGroundItemObjects() {
for (let i in getServerData().groundItemCache) { for (let i in getServerData().groundItemCache) {
createGroundItemObject(i); createGroundItemObject(getServerData().groundItemCache[i]);
} }
} }
@@ -2270,6 +2272,20 @@ function deleteItem(itemId, whoDeleted = -1) {
function getBestNewOwnerToPutItem(client) { function getBestNewOwnerToPutItem(client) {
let position = getPlayerPosition(client); let position = getPlayerPosition(client);
let possibleItem = getClosestItemOnGround(position);
if (possibleItem != -1) {
if (getDistance(getItemPosition(possibleItem), position) <= getGlobalConfig().itemContainerDistance) {
return [AGRP_ITEM_OWNER_ITEM, possibleItem];
}
}
let possibleVehicle = getClosestVehicle(position);
if (possibleVehicle != false) {
if (getVehicleData(possibleVehicle) != false && getDistance(getVehicleTrunkPosition(possibleVehicle), position) <= getGlobalConfig().vehicleTrunkDistance) {
return [AGRP_ITEM_OWNER_VEHTRUNK, possibleVehicle];
}
}
let possibleHouse = getPlayerHouse(client); let possibleHouse = getPlayerHouse(client);
if (possibleHouse != -1) { if (possibleHouse != -1) {
if (getHouseData(possibleHouse) != false) { if (getHouseData(possibleHouse) != false) {
@@ -2284,20 +2300,6 @@ function getBestNewOwnerToPutItem(client) {
} }
} }
let possibleVehicle = getClosestVehicle(position);
if (possibleVehicle != false) {
if (getVehicleData(possibleVehicle) != false && getDistance(getVehicleTrunkPosition(possibleVehicle), position) <= getGlobalConfig().vehicleTrunkDistance) {
return [AGRP_ITEM_OWNER_VEHTRUNK, possibleVehicle];
}
}
let possibleItem = getClosestItemOnGround(position);
if (possibleItem != -1) {
if (getDistance(getItemPosition(possibleItem), position) <= getGlobalConfig().itemContainerDistance) {
return [AGRP_ITEM_OWNER_ITEM, possibleItem];
}
}
return [AGRP_ITEM_OWNER_NONE, 0]; return [AGRP_ITEM_OWNER_NONE, 0];
} }
@@ -2310,6 +2312,15 @@ function getBestItemToTake(client, slot) {
let ownerType = AGRP_ITEM_OWNER_NONE; let ownerType = AGRP_ITEM_OWNER_NONE;
let ownerId = 0; let ownerId = 0;
let possibleItem = getClosestItemOnGround(position);
if (getItemData(possibleItem)) {
if (typeof getItemData(possibleItem).itemCache[slot] != "undefined") {
itemId = getItemData(possibleItem).itemCache[slot]
ownerType = AGRP_ITEM_OWNER_ITEM;
ownerId = possibleItem;
}
}
let possibleHouse = getPlayerHouse(client); let possibleHouse = getPlayerHouse(client);
if (getHouseData(possibleHouse)) { if (getHouseData(possibleHouse)) {
if (typeof getHouseData(possibleHouse).itemCache[slot] != "undefined") { if (typeof getHouseData(possibleHouse).itemCache[slot] != "undefined") {