mirror of
https://github.com/Znote/ZnoteAAC.git
synced 2025-10-13 18:04:54 +02:00
Fix #303 SQL error when joining a guild when your already in another guild
This commit is contained in:
@@ -371,7 +371,8 @@ function guild_player_join($cid, $gid) {
|
||||
// Add to guild if rank id was found:
|
||||
if ($rid != false) {
|
||||
// Remove the invite:
|
||||
guild_remove_invitation($cid, $gid);
|
||||
//guild_remove_invitation($cid, $gid);
|
||||
guild_remove_all_invitations($cid);
|
||||
// Add to guild:
|
||||
mysql_update("UPDATE `players` SET `rank_id`='$rid' WHERE `id`=$cid");
|
||||
$status = true;
|
||||
@@ -383,7 +384,8 @@ function guild_player_join($cid, $gid) {
|
||||
if ($guildrank !== false) {
|
||||
$rid = $guildrank['id'];
|
||||
// Remove invite
|
||||
guild_remove_invitation($cid, $gid);
|
||||
//guild_remove_invitation($cid, $gid);
|
||||
guild_remove_all_invitations($cid);
|
||||
// Add to guild
|
||||
mysql_insert("INSERT INTO `guild_membership` (`player_id`, `guild_id`, `rank_id`, `nick`) VALUES ('$cid', '$gid', '$rid', '');");
|
||||
// Return success
|
||||
@@ -400,6 +402,12 @@ function guild_remove_invitation($cid, $gid) {
|
||||
mysql_delete("DELETE FROM `guild_invites` WHERE `player_id`='$cid' AND `guild_id`='$gid';");
|
||||
}
|
||||
|
||||
// Remove ALL invitations
|
||||
function guild_remove_all_invitations($cid) {
|
||||
$cid = (int)$cid;
|
||||
mysql_delete("DELETE FROM `guild_invites` WHERE `player_id`='$cid';");
|
||||
}
|
||||
|
||||
// Invite character to guild
|
||||
function guild_invite_player($cid, $gid) {
|
||||
$cid = (int)$cid;
|
||||
|
Reference in New Issue
Block a user