Bläddra i källkod

other int -> long conversion and adena max count checks

janiii 16 år sedan
förälder
incheckning
057b2bbfcf

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/RecipeController.java

@@ -775,7 +775,7 @@ public class RecipeController
 			for (L2RecipeInstance recipe : recipes)
 			{
 				int quantity = _recipeList.isConsumable() ? (int) (recipe.getQuantity() * Config.RATE_CONSUMABLE_COST)
-				                                         : (int) recipe.getQuantity();
+				                                         : recipe.getQuantity();
 
 				if (quantity > 0)
 				{

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ObservationInstance.java

@@ -84,7 +84,7 @@ public final class L2ObservationInstance extends L2NpcInstance
     private void doObserve(L2PcInstance player, String val)
     {
         StringTokenizer st = new StringTokenizer(val);
-        int cost = Integer.parseInt(st.nextToken());
+        long cost = Long.parseLong(st.nextToken());
         int x = Integer.parseInt(st.nextToken());
         int y = Integer.parseInt(st.nextToken());
         int z = Integer.parseInt(st.nextToken());

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -351,11 +351,11 @@ public class L2SignsPriestInstance extends L2NpcInstance
                     }
                     break;
                 case 7: // Exchange Ancient Adena for Adena - SevenSigns 7 xxxxxxx
-                    int ancientAdenaConvert = 0;
+                    long ancientAdenaConvert = 0;
 
                     try
                     {
-                        ancientAdenaConvert = Integer.parseInt(command.substring(13).trim());
+                        ancientAdenaConvert = Long.parseLong(command.substring(13).trim());
                     }
                     catch (NumberFormatException e)
                     {

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/MultiSellChoose.java

@@ -47,7 +47,7 @@ public class MultiSellChoose extends L2GameClientPacket
 	private int _entryId;
 	private long _amount;
 	private int _enchantment;
-	private int _transactionTax; // local handling of taxation
+	private long _transactionTax; // local handling of taxation
 	@SuppressWarnings("unused")
     private int _unk1;
 	@SuppressWarnings("unused")
@@ -474,7 +474,7 @@ public class MultiSellChoose extends L2GameClientPacket
 						taxRate = merchant.getCastle().getTaxRate();
 				}
 				
-				_transactionTax = (int) Math.round(newIngredient.getItemCount() * taxRate);
+				_transactionTax = Math.round(newIngredient.getItemCount() * taxRate);
 				totalAdenaCount += _transactionTax;
 				continue; // do not yet add this adena amount to the list as non-taxIngredient adena might be entered later (order not guaranteed)
 			}

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestPackageSend.java

@@ -95,7 +95,7 @@ public final class RequestPackageSend extends L2GameClientPacket
         	if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_WAREHOUSE && player.getKarma() > 0) return;
 
         	// Freight price from config or normal price per item slot (30)
-        	int fee = _count * Config.ALT_GAME_FREIGHT_PRICE;
+        	long fee = _count * Config.ALT_GAME_FREIGHT_PRICE;
         	long currentAdena = player.getAdena();
         	int slots = 0;
 

+ 2 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestPrivateStoreBuy.java

@@ -23,6 +23,7 @@ import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.model.TradeList;
 import net.sf.l2j.gameserver.model.TradeList.TradeItem;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
+import net.sf.l2j.gameserver.model.itemcontainer.PcInventory;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.SystemMessage;
@@ -119,7 +120,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket
         }
 
         // FIXME: this check should be (and most probably is) done in the TradeList mechanics
-		if(priceTotal < 0 || priceTotal > Integer.MAX_VALUE)
+		if(priceTotal < 0 || priceTotal > PcInventory.MAX_ADENA)
         {
             String msgErr = "[RequestPrivateStoreBuy] player "+getClient().getActiveChar().getName()+" tried an overflow exploit, ban this player!";
             Util.handleIllegalPlayerAction(getClient().getActiveChar(),msgErr,Config.DEFAULT_PUNISH);

+ 2 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestPrivateStoreSell.java

@@ -22,6 +22,7 @@ import net.sf.l2j.gameserver.model.L2Object;
 import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.model.TradeList;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
+import net.sf.l2j.gameserver.model.itemcontainer.PcInventory;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.util.Util;
 
@@ -73,7 +74,7 @@ public final class RequestPrivateStoreSell extends L2GameClientPacket
 			priceTotal += price * count;
 		}
 
-		if(priceTotal < 0 || priceTotal > Integer.MAX_VALUE)
+		if(priceTotal < 0 || priceTotal > PcInventory.MAX_ADENA)
         {
             String msgErr = "[RequestPrivateStoreSell] player "+getClient().getActiveChar().getName()+" tried an overflow exploit, ban this player!";
             Util.handleIllegalPlayerAction(getClient().getActiveChar(),msgErr,Config.DEFAULT_PUNISH);

+ 1 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestProcureCropList.java

@@ -201,8 +201,7 @@ public class RequestProcureCropList extends L2GameClientPacket
 				continue;
 
 			long sellPrice = (count * crop.getPrice());
-			long rewardPrice = ItemTable.getInstance().getTemplate(rewardItem)
-					.getReferencePrice();
+			long rewardPrice = ItemTable.getInstance().getTemplate(rewardItem).getReferencePrice();
 
 			if (rewardPrice == 0)
 				continue;

+ 4 - 3
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestSellItem.java

@@ -25,6 +25,7 @@ import net.sf.l2j.gameserver.model.actor.instance.L2MerchantInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2MerchantSummonInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PetManagerInstance;
+import net.sf.l2j.gameserver.model.itemcontainer.PcInventory;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.ItemList;
@@ -178,9 +179,9 @@ public final class RequestSellItem extends L2GameClientPacket
         	if (item == null || (!item.isSellable())) continue;
 
             totalPrice += item.getReferencePrice() * count /2;
-            if (totalPrice > Integer.MAX_VALUE)
+            if (totalPrice > PcInventory.MAX_ADENA)
             {
-                Util.handleIllegalPlayerAction(player,"Warning!! Character "+player.getName()+" of account "+player.getAccountName()+" tried to purchase over "+Integer.MAX_VALUE+" adena worth of goods.",  Config.DEFAULT_PUNISH);
+                Util.handleIllegalPlayerAction(player,"Warning!! Character "+player.getName()+" of account "+player.getAccountName()+" tried to purchase over "+PcInventory.MAX_ADENA+" adena worth of goods.",  Config.DEFAULT_PUNISH);
                 return;
             }
 
@@ -207,7 +208,7 @@ public final class RequestSellItem extends L2GameClientPacket
 				}
 */
 		}
-		player.addAdena("Sell", (int)totalPrice, merchant, false);
+		player.addAdena("Sell", totalPrice, merchant, false);
 		String html;
 		if (merchant instanceof L2MerchantInstance)
 			html = HtmCache.getInstance().getHtm("data/html/"+ htmlFolder +"/" + ((L2MerchantInstance)merchant).getNpcId() + "-sold.htm");

+ 4 - 3
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestWearItem.java

@@ -30,6 +30,7 @@ import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.actor.instance.L2MercManagerInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2MerchantInstance;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
+import net.sf.l2j.gameserver.model.itemcontainer.PcInventory;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.InventoryUpdate;
@@ -192,9 +193,9 @@ public final class RequestWearItem extends L2GameClientPacket
 			slots++;
 			
 			totalPrice += Config.WEAR_PRICE;
-			if (totalPrice > Integer.MAX_VALUE)
+			if (totalPrice > PcInventory.MAX_ADENA)
 			{
-				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + Integer.MAX_VALUE + " adena worth of goods.", Config.DEFAULT_PUNISH);
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + PcInventory.MAX_ADENA + " adena worth of goods.", Config.DEFAULT_PUNISH);
 				return;
 			}
 		}
@@ -214,7 +215,7 @@ public final class RequestWearItem extends L2GameClientPacket
 		}
 		
 		// Charge buyer and add tax to castle treasury if not owned by npc clan because a Try On is not Free
-		if ((totalPrice < 0) || !player.reduceAdena("Wear", (int) totalPrice, player.getLastFolkNPC(), false))
+		if ((totalPrice < 0) || !player.reduceAdena("Wear", totalPrice, player.getLastFolkNPC(), false))
 		{
 			sendPacket(new SystemMessage(SystemMessageId.YOU_NOT_ENOUGH_ADENA));
 			return;

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -100,7 +100,7 @@ public final class SendWareHouseDepositList extends L2GameClientPacket
         if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_WAREHOUSE && player.getKarma() > 0) return;
 
         // Freight price from config or normal price per item slot (30)
-		int fee = _count * 30;
+		long fee = _count * 30;
 		long currentAdena = player.getAdena();
         int slots = 0;
 

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/BuyList.java

@@ -122,9 +122,9 @@ public final class BuyList extends L2GameServerPacket
 				}
 
 	            if (item.getItemId() >= 3960 && item.getItemId() <= 4026)//Config.RATE_SIEGE_GUARDS_PRICE-//'
-	                writeQ((int)(item.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate)));
+	                writeQ((long) (item.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate)));
 	            else
-	                writeQ((int)(item.getPrice() * (1 + _taxRate)));
+	                writeQ((long) (item.getPrice() * (1 + _taxRate)));
                 
                 // T1
 				for (byte i = 0; i < 8; i++)

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/ExShowSeedSetting.java

@@ -65,7 +65,7 @@ public class ExShowSeedSetting extends L2GameServerPacket
             _seedData[i * 12 + 3] = L2Manor.getInstance().getRewardItemBySeed(
                     s, 2);
             _seedData[i * 12 + 4] = L2Manor.getInstance().getSeedSaleLimit(s);
-            _seedData[i * 12 + 5] = (int)L2Manor.getInstance().getSeedBuyPrice(s);
+            _seedData[i * 12 + 5] = L2Manor.getInstance().getSeedBuyPrice(s);
             _seedData[i * 12 + 6] = L2Manor.getInstance().getSeedBasicPrice(s) * 60 / 100;
             _seedData[i * 12 + 7] = L2Manor.getInstance().getSeedBasicPrice(s) * 10;
             SeedProduction seedPr = c.getSeed(s,