aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try fix Trade System

Browse Source
This commit is contained in:
Lukas Moungos
2019-07-28 22:52:28 +02:00
parent fc4ee82427
commit 32b1e3d9eb
2 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ReallifeGamemode.Client/assets/html/inventory/handel/script.js
View File

@@ -2,7 +2,6 @@
$(document).ready(function () {
//fire functions before page load
drawToPage();
moveItemsInv();
console.log("loading finished");
mp.trigger("CEF:BrowserLoadedTrade");
});
@@ -120,7 +119,6 @@ function addToInvenotry(addItem) {
playerInventory[unfininshedStack].amount += cloneItem.amount;
unfininshedStack = undefined;
drawToPage();
moveItemsInv();
break;
}
else if (playerInventory[unfininshedStack].amount + cloneItem.amount > 10) {
@@ -131,7 +129,6 @@ function addToInvenotry(addItem) {
addToInvenotry(recycleCloned);
unfininshedStack = undefined;
drawToPage();
moveItemsInv();
break;
}
}
@@ -142,13 +139,11 @@ function addToInvenotry(addItem) {
cloneItem.amount -= 10;
addToInvenotry(cloneItem);
drawToPage();
moveItemsInv();
break;
}
else if (unfininshedStack == undefined && playerInventory[i].object === 'false') {
playerInventory[i] = cloneItem;
drawToPage();
moveItemsInv();
break;
}
}
@@ -161,43 +156,6 @@ function getAllItemSlotData() {
var currentSelected;
function moveItemsInv() {
getAllItemSlotData();
for (var i = 0; i < getItemSlotData.length; i++) {
getItemSlotData[i].addEventListener("click", function () {
if (this.classList.contains('selected')) {
this.classList.remove('selected');
currentSelected = undefined;
}
else if (this.getAttribute('object') === 'false' && isNaN(currentSelected)) {
return;
}
else if (currentSelected) {
if (playerInventory[currentSelected].stackable === 'false' || playerInventory[currentSelected].itemId != playerInventory[this.getAttribute('data-value')].itemId) {
var swap = playerInventory[this.getAttribute('data-value')];
playerInventory[this.getAttribute('data-value')] = playerInventory[currentSelected];
playerInventory[currentSelected] = swap;
drawToPage();
currentSelected = undefined;
getItemSlotData = document.getElementsByClassName('itemSlot');
moveItemsInv();
}
else if (playerInventory[currentSelected].itemId == playerInventory[this.getAttribute('data-value')].itemId && playerInventory[currentSelected].stackable) {
playerInventory[this.getAttribute('data-value')].amount += playerInventory[currentSelected].amount
playerInventory[currentSelected] = EmptySlot;
drawToPage();
currentSelected = undefined;
getItemSlotData = document.getElementsByClassName('itemSlot');
moveItemsInv();
}
}
else {
this.className += ' selected'
currentSelected = this.getAttribute('data-value')
}
});
}
}
function refreshAllCurrentItems() {
var remove = document.getElementById('invContainer');

15
ReallifeGamemode.Server/Managers/ManagerOfInventory.cs
View File

@@ -113,7 +113,6 @@ namespace ReallifeGamemode.Server.Managers
}
[RemoteEvent("declineTrade")]
public void SendBackToSender(Client client)
{
User user = client.GetUser();
@@ -149,6 +148,20 @@ namespace ReallifeGamemode.Server.Managers
}
}
[RemoteEvent("declineTrade")]
public void ServerEvent_declineTrade(Client client)
{
int id = client.GetData("tradePartner");
Client target = ClientService.GetClientByNameOrId(id.ToString());
if (target == null || !target.IsLoggedIn())
{
ChatService.PlayerNotFound(client);
return;
}
SendBackToSender(target);
}
public static void OpenTradeAccept(Client client)
{
User user = client.GetUser();