Proper naming for separateAndSend method.

This commit is contained in:
MobiusDevelopment 2020-06-23 00:58:52 +00:00
parent cfb997c5ee
commit 39e9bd6836
10 changed files with 18 additions and 18 deletions

View File

@ -234,7 +234,7 @@ public class MultisellData
return newEntry;
}
public void SeparateAndSend(int listId, PlayerInstance player, boolean inventoryOnly, double taxRate)
public void separateAndSend(int listId, PlayerInstance player, boolean inventoryOnly, double taxRate)
{
final MultiSellListContainer list = generateMultiSell(listId, inventoryOnly, player, taxRate);
MultiSellListContainer temp = new MultiSellListContainer();

View File

@ -35,7 +35,7 @@ public class BlacksmithInstance extends FolkInstance
if (command.startsWith("multisell"))
{
final int listId = Integer.parseInt(command.substring(9).trim());
MultisellData.getInstance().SeparateAndSend(listId, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(listId, player, false, getCastle().getTaxRate());
}
super.onBypassFeedback(player, command);
}

View File

@ -171,7 +171,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
MultisellData.getInstance().SeparateAndSend(val, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(val, player, false, getCastle().getTaxRate());
}
else if (actualCommand.equalsIgnoreCase("Exc_Multisell"))
{
@ -181,7 +181,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
MultisellData.getInstance().SeparateAndSend(val, player, true, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(val, player, true, getCastle().getTaxRate());
}
else
{

View File

@ -1301,11 +1301,11 @@ public class NpcInstance extends Creature
}
else if (command.startsWith("multisell"))
{
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
}
else if (command.startsWith("exc_multisell"))
{
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
}
else if (command.startsWith("npcfind_byid"))
{

View File

@ -148,7 +148,7 @@ public class OlympiadManagerInstance extends FolkInstance
}
case 7:
{
MultisellData.getInstance().SeparateAndSend(102, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(102, player, false, getCastle().getTaxRate());
break;
}
default:

View File

@ -234,7 +234,7 @@ public class MultisellData
return newEntry;
}
public void SeparateAndSend(int listId, PlayerInstance player, boolean inventoryOnly, double taxRate)
public void separateAndSend(int listId, PlayerInstance player, boolean inventoryOnly, double taxRate)
{
final MultiSellListContainer list = generateMultiSell(listId, inventoryOnly, player, taxRate);
MultiSellListContainer temp = new MultiSellListContainer();

View File

@ -35,7 +35,7 @@ public class BlacksmithInstance extends FolkInstance
if (command.startsWith("multisell"))
{
final int listId = Integer.parseInt(command.substring(9).trim());
MultisellData.getInstance().SeparateAndSend(listId, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(listId, player, false, getCastle().getTaxRate());
}
super.onBypassFeedback(player, command);
}

View File

@ -171,7 +171,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
MultisellData.getInstance().SeparateAndSend(val, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(val, player, false, getCastle().getTaxRate());
}
else if (actualCommand.equalsIgnoreCase("Exc_Multisell"))
{
@ -181,7 +181,7 @@ public class MerchantInstance extends FolkInstance
}
final int val = Integer.parseInt(st.nextToken());
MultisellData.getInstance().SeparateAndSend(val, player, true, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(val, player, true, getCastle().getTaxRate());
}
else
{

View File

@ -1307,11 +1307,11 @@ public class NpcInstance extends Creature
}
else if (command.startsWith("multisell"))
{
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(Integer.parseInt(command.substring(9).trim()), player, false, getCastle().getTaxRate());
}
else if (command.startsWith("exc_multisell"))
{
MultisellData.getInstance().SeparateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(Integer.parseInt(command.substring(13).trim()), player, true, getCastle().getTaxRate());
}
else if (command.startsWith("Augment"))
{
@ -1387,7 +1387,7 @@ public class NpcInstance extends Creature
}
else
{
MultisellData.getInstance().SeparateAndSend(10010, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(10010, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1407,7 +1407,7 @@ public class NpcInstance extends Creature
}
else
{
MultisellData.getInstance().SeparateAndSend(10011, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(10011, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1455,7 +1455,7 @@ public class NpcInstance extends Creature
}
else
{
MultisellData.getInstance().SeparateAndSend(10012, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(10012, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)
@ -1475,7 +1475,7 @@ public class NpcInstance extends Creature
}
else
{
MultisellData.getInstance().SeparateAndSend(10013, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(10013, player, false, getCastle().getTaxRate());
}
}
catch (NumberFormatException nfe)

View File

@ -148,7 +148,7 @@ public class OlympiadManagerInstance extends FolkInstance
}
case 7:
{
MultisellData.getInstance().SeparateAndSend(102, player, false, getCastle().getTaxRate());
MultisellData.getInstance().separateAndSend(102, player, false, getCastle().getTaxRate());
break;
}
default: