Changeset 49073773c30643d51b0261d90586e043cf00cfcc
- Timestamp:
- 03/02/07 18:11:38
(2 years ago)
- Author:
- Christopher Jung <bktheg@web.de>
- git-committer:
- Christopher Jung <bktheg@web.de> 1172855498 +0100
- git-parent:
[d735085ba914af6134968e471b5f971aadf1ca98]
- git-author:
- Christopher Jung <bktheg@web.de> 1172855498 +0100
- Message:
NullPointerException? gefixt
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r748375d |
r4907377 |
|
| 113 | 113 | UserFlagschiffLocation flagschiffstatus = enemyuser.getFlagschiff(); |
|---|
| 114 | 114 | |
|---|
| 115 | | if( !ownuser.hasFlagschiffSpace() && (flagschiffstatus.getID() == enemyShip.getInt("id")) ) { |
|---|
| | 115 | if( !ownuser.hasFlagschiffSpace() && (flagschiffstatus != null) && |
|---|
| | 116 | (flagschiffstatus.getID() == enemyShip.getInt("id")) ) { |
|---|
| 116 | 117 | return RESULT_ERROR; |
|---|
| 117 | 118 | } |
|---|
| … | … | |
| 272 | 273 | UserFlagschiffLocation flagschiffstatus = euser.getFlagschiff(); |
|---|
| 273 | 274 | |
|---|
| 274 | | if( (flagschiffstatus.getType() == UserFlagschiffLocation.Type.SHIP) && (enemyShip.getInt("id") == flagschiffstatus.getID()) ) { |
|---|
| | 275 | if( (flagschiffstatus != null) && (flagschiffstatus.getType() == UserFlagschiffLocation.Type.SHIP) && |
|---|
| | 276 | (enemyShip.getInt("id") == flagschiffstatus.getID()) ) { |
|---|
| 275 | 277 | euser.setFlagschiff(0); |
|---|
| 276 | 278 | user.setFlagschiff(enemyShip.getInt("id")); |
|---|
