projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-08 23:12:57 -04:00
Code Issues Projects Releases Wiki Activity

Fixed a trade bug and a /open bug

Browse Source
This commit is contained in:
Seefo
2014-03-29 16:11:10 -04:00
parent e7cf35d749
commit 85582bdd29
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+1 -1
View File
@@ -872,7 +872,7 @@ public class SimulationService implements INetworkDispatch {
if(container.getPermissions().canView(requester, container)) {
OpenedContainerMessage opm = new OpenedContainerMessage(container.getObjectID());
if(requester.getClient() != null && requester.getClient().getSession() != null)
if(requester.getClient() != null && requester.getClient().getSession() != null && !(container instanceof CreatureObject))
requester.getClient().getSession().write(opm.serialize());
}
src/services/trade/TradeService.java
+2 -1
View File
@@ -25,6 +25,7 @@ import resources.objects.creature.CreatureObject;
import engine.clients.Client;
import engine.resources.container.AllPermissions;
import engine.resources.container.CreatureContainerPermissions;
import engine.resources.container.CreaturePermissions;
import engine.resources.objects.SWGObject;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
@@ -205,7 +206,7 @@ public class TradeService implements INetworkDispatch{
}
else {
if(objectToTrade.getAttributes().containsKey("no_trade")) {
if(objectToTrade.getAttributes().containsKey("no_trade") || !objectToTrade.getPermissions().canRemove(client.getParent(), objectToTrade.getContainer()) || (objectToTrade.getContainer() instanceof CreatureObject)) {
return;
}