projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/services/bazaar/BazaarService.java
This commit is contained in:
Light2
2014-05-21 19:16:21 +02:00
parent 4e8a9ae47c c4578eb953
commit c7e41a83e9
995 changed files with 31627 additions and 4053 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/bazaar/BazaarService.java
+2 -14
View File
@@ -22,24 +22,14 @@
package services.bazaar;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.BiFunction;
import java.util.function.Function;
import com.sleepycat.je.Transaction;
import com.sleepycat.persist.EntityCursor;
import main.NGECore;
import engine.clients.Client;
import engine.resources.database.ODBCursor;
@@ -50,7 +40,7 @@ import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
import resources.common.Opcodes;
import resources.common.OutOfBand;
import resources.common.ProsePackage;
import resources.datatables.DisplayType;
import resources.objects.building.BuildingObject;
import resources.objects.creature.CreatureObject;
import resources.objects.intangible.IntangibleObject;
@@ -690,14 +680,12 @@ public class BazaarService implements INetworkDispatch {
core.objectService.destroyObject(item);
if(vendor.getTemplate().contains("terminal_bazaar")) {
ProsePackage prose = new ProsePackage("base_player", "sale_fee");
int salesFee = SALES_FEE;
if(premium)
salesFee *= 5;
player.setBankCredits(player.getBankCredits() - salesFee);
prose.setDiInteger(salesFee);
player.sendSystemMessage(new OutOfBand(prose), (byte) 0);
player.sendSystemMessage(OutOfBand.ProsePackage("@base_player:sale_fee", salesFee), DisplayType.Broadcast);
}
if(auction) {