Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes for recent /transferclaim changes.

Browse Source
This commit is contained in:
ryanhamshire 2015-02-11 17:24:40 -08:00
parent ed3347ab9b
commit a29f18fe7a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/me/ryanhamshire/GriefPrevention/DataStore.java
View File

@ -324,7 +324,12 @@ public abstract class DataStore
} }
//determine new owner //determine new owner
PlayerData newOwnerData = this.getPlayerData(newOwnerID); PlayerData newOwnerData = null;
if(newOwnerID != null)
{
newOwnerData = this.getPlayerData(newOwnerID);
}
//transfer //transfer
claim.ownerID = newOwnerID; claim.ownerID = newOwnerID;
@ -336,8 +341,11 @@ public abstract class DataStore
ownerData.getClaims().remove(claim); ownerData.getClaims().remove(claim);
} }
if(newOwnerData != null)
{
newOwnerData.getClaims().add(claim); newOwnerData.getClaims().add(claim);
} }
}
//adds a claim to the datastore, making it an effective claim //adds a claim to the datastore, making it an effective claim
synchronized void addClaim(Claim newClaim, boolean writeToStorage) synchronized void addClaim(Claim newClaim, boolean writeToStorage)

12
src/me/ryanhamshire/GriefPrevention/GriefPrevention.java
View File

@ -976,32 +976,36 @@ public class GriefPrevention extends JavaPlugin
return true; return true;
} }
OfflinePlayer targetPlayer = null; //no argument = make an admin claim UUID newOwnerID = null; //no argument = make an admin claim
String ownerName = "admin";
if(args.length > 0) if(args.length > 0)
{ {
targetPlayer = this.resolvePlayerByName(args[0]); OfflinePlayer targetPlayer = this.resolvePlayerByName(args[0]);
if(targetPlayer == null) if(targetPlayer == null)
{ {
GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2); GriefPrevention.sendMessage(player, TextMode.Err, Messages.PlayerNotFound2);
return true; return true;
} }
newOwnerID = targetPlayer.getUniqueId();
ownerName = targetPlayer.getName();
} }
//change ownerhsip //change ownerhsip
try try
{ {
this.dataStore.changeClaimOwner(claim, targetPlayer.getUniqueId()); this.dataStore.changeClaimOwner(claim, newOwnerID);
} }
catch(Exception e) catch(Exception e)
{ {
e.printStackTrace();
GriefPrevention.sendMessage(player, TextMode.Instr, Messages.TransferTopLevel); GriefPrevention.sendMessage(player, TextMode.Instr, Messages.TransferTopLevel);
return true; return true;
} }
//confirm //confirm
GriefPrevention.sendMessage(player, TextMode.Success, Messages.TransferSuccess); GriefPrevention.sendMessage(player, TextMode.Success, Messages.TransferSuccess);
GriefPrevention.AddLogEntry(player.getName() + " transferred a claim at " + GriefPrevention.getfriendlyLocationString(claim.getLesserBoundaryCorner()) + " to " + targetPlayer.getName() + "."); GriefPrevention.AddLogEntry(player.getName() + " transferred a claim at " + GriefPrevention.getfriendlyLocationString(claim.getLesserBoundaryCorner()) + " to " + ownerName + ".");
return true; return true;
} }