Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an NPE

Browse Source
This commit is contained in:
Olof Larsson 2013-04-29 10:35:49 +02:00
parent c34c2354bd
commit 5649117b1f
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/massivecraft/mcore/ps/PSFormatAbstract.java
View File

@ -88,22 +88,18 @@ public class PSFormatAbstract implements PSFormat
Object val = null; Object val = null;
if (this.useWorldDisplayname) val = ps.getWorld();
if (val != null)
{ {
val = ps.getWorld(); if (this.useWorldDisplayname)
val = Mixin.getWorldDisplayName(val.toString()); {
if (val != null) ret.add(String.format(this.formatWorld, val)); val = Mixin.getWorldDisplayName(val.toString());
} }
else if (this.useWorldAlias) else if (this.useWorldAlias)
{ {
val = ps.getWorld(); val = Mixin.getWorldAliasOrId(val.toString());
val = Mixin.getWorldAliasOrId(val.toString()); }
if (val != null) ret.add(String.format(this.formatWorld, val)); ret.add(String.format(this.formatWorld, val));
}
else
{
val = ps.getWorld();
if (val != null) ret.add(String.format(this.formatWorld, val));
} }
val = ps.getBlockX(); val = ps.getBlockX();