Skip to content

Commit

Permalink
Fixes non sharding summoned death
Browse files Browse the repository at this point in the history
Fix for #182
  • Loading branch information
rourke750 committed Oct 7, 2016
1 parent 9157294 commit 3383cc9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.untamedears</groupId>
<artifactId>PrisonPearl</artifactId>
<packaging>jar</packaging>
<version>3.1.21</version>
<version>3.1.22</version>
<name>PrisonPearl</name>
<url>https://github.com/Civcraft/PrisonPearl</url>

Expand Down
7 changes: 7 additions & 0 deletions src/vg/civcraft/mc/prisonpearl/PrisonPearlUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ public static void playerRespawnEventSpawn(Player player, PlayerRespawnEvent eve
PrisonPearlManager pearls = PrisonPearlPlugin.getPrisonPearlManager();
PrisonPearlPlugin.doDebug("The player {0} is now teleporting to world {1}",
player.getName(), pearls.getImprisonWorldName());
if (PrisonPearlPlugin.getSummonManager().isSummoned(player)) {
PrisonPearlPlugin.getSummonManager().
returnPlayer(PrisonPearlPlugin.getPrisonPearlManager().getByImprisoned(player), event);
// Summon method has all the code needed to respawn the player.
// So we are done here.
return;
}
event.setRespawnLocation(pearls.getImprisonWorld().getSpawnLocation());
}

Expand Down

0 comments on commit 3383cc9

Please sign in to comment.