Fix NPE when players rejoin the server in a dimension that was deleted (#6511)
This commit is contained in:
parent
63cb030cba
commit
e95ba8a3dc
1 changed files with 4 additions and 2 deletions
|
@ -8,12 +8,14 @@
|
||||||
|
|
||||||
public PlayerList(MinecraftServer p_i50688_1_, int p_i50688_2_) {
|
public PlayerList(MinecraftServer p_i50688_1_, int p_i50688_2_) {
|
||||||
this.field_72400_f = p_i50688_1_;
|
this.field_72400_f = p_i50688_1_;
|
||||||
@@ -110,6 +111,14 @@
|
@@ -109,7 +110,15 @@
|
||||||
|
String s = gameprofile1 == null ? gameprofile.getName() : gameprofile1.getName();
|
||||||
playerprofilecache.func_152649_a(gameprofile);
|
playerprofilecache.func_152649_a(gameprofile);
|
||||||
CompoundNBT compoundnbt = this.func_72380_a(p_72355_2_);
|
CompoundNBT compoundnbt = this.func_72380_a(p_72355_2_);
|
||||||
ServerWorld serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
- ServerWorld serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
||||||
+
|
+
|
||||||
+ //Forge: Make sure the dimension hasn't been deleted, if so stick them in the overworld.
|
+ //Forge: Make sure the dimension hasn't been deleted, if so stick them in the overworld.
|
||||||
|
+ ServerWorld serverworld = p_72355_2_.field_71093_bK != null ? this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK) : null ;
|
||||||
+ if (serverworld == null) {
|
+ if (serverworld == null) {
|
||||||
+ p_72355_2_.field_71093_bK = DimensionType.field_223227_a_;
|
+ p_72355_2_.field_71093_bK = DimensionType.field_223227_a_;
|
||||||
+ serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
+ serverworld = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
||||||
|
|
Loading…
Reference in a new issue