Replaced concatenations with infix operations.

This commit is contained in:
MobiusDev
2018-09-08 22:58:58 +00:00
parent eb3742d44f
commit bb7e3b8e1b
13 changed files with 44 additions and 44 deletions

View File

@@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000));
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName)));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null));
zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED)));
currentInfo.setZoneStage(7); currentInfo.setZoneStage(7);
ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min
@@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
} }
} }
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic")));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
return; return;
} }

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000));
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName)));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null));
zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED)));
currentInfo.setZoneStage(7); currentInfo.setZoneStage(7);
ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min
@@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
} }
} }
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic")));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
return; return;
} }

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000));
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName)));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null));
zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED)));
currentInfo.setZoneStage(7); currentInfo.setZoneStage(7);
ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min
@@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
} }
} }
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic")));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
return; return;
} }

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000));
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName)));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null));
zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED)));
currentInfo.setZoneStage(7); currentInfo.setZoneStage(7);
ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min
@@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
} }
} }
String zoneName = zone.getName().toLowerCase().replace(" ", "_"); String zoneName = zone.getName().toLowerCase().replace(" ", "_");
_templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic")));
_templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null));
return; return;
} }

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -167,17 +167,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
PreparedStatement statement = con.prepareStatement(q); PreparedStatement statement = con.prepareStatement(q);
ResultSet rset = statement.executeQuery(); ResultSet rset = statement.executeQuery();

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);

View File

@@ -155,17 +155,17 @@ public class SQLAccountManager
String q = "SELECT login, accessLevel FROM accounts "; String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1")) if (m.equals("1"))
{ {
q = q.concat("WHERE accessLevel < 0"); q += "WHERE accessLevel < 0";
} }
else if (m.equals("2")) else if (m.equals("2"))
{ {
q = q.concat("WHERE accessLevel > 0"); q += "WHERE accessLevel > 0";
} }
else if (m.equals("3")) else if (m.equals("3"))
{ {
q = q.concat("WHERE accessLevel = 0"); q += "WHERE accessLevel = 0";
} }
q = q.concat(" ORDER BY login ASC"); q += " ORDER BY login ASC";
try (Connection con = DatabaseFactory.getConnection(); try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(q); PreparedStatement ps = con.prepareStatement(q);