Update of /cvsroot/rails/18xx/rails/game/specific/_18EU
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14508/rails/game/specific/_18EU
Modified Files:
PullmanRevenueModifier.java
Log Message:
Further minor fixes for revenue calculation (18EU)
Index: PullmanRevenueModifier.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/PullmanRevenueModifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PullmanRevenueModifier.java 20 May 2010 23:13:21 -0000 1.1
--- PullmanRevenueModifier.java 21 May 2010 16:15:24 -0000 1.2
***************
*** 20,24 ****
List<NetworkTrain> trains = revenueAdapter.getTrains();
for (NetworkTrain train:trains) {
! if (train.getRailsTrainType().getName().equals("P")) {
hasPullman = true;
revenueAdapter.removeTrain(train); // remove from revenueAdapter
--- 20,24 ----
List<NetworkTrain> trains = revenueAdapter.getTrains();
for (NetworkTrain train:trains) {
! if (train.getRailsTrainType() != null && train.getRailsTrainType().getName().equals("P")) {
hasPullman = true;
revenueAdapter.removeTrain(train); // remove from revenueAdapter
|
