Fork/mmocore
2
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

!improved request code

Browse Source
This commit is contained in:
Indyuce 2022-02-20 12:38:26 +01:00
parent 06f1ab2ab0
commit da4e3763cc
6 changed files with 148 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/Indyuce/mmocore/api/player/social/FriendRequest.java
View File

@ -6,32 +6,23 @@ import net.Indyuce.mmocore.api.player.PlayerData;
import org.bukkit.Sound; import org.bukkit.Sound;
public class FriendRequest extends Request { public class FriendRequest extends Request {
private final PlayerData target;
public FriendRequest(PlayerData creator, PlayerData target) { public FriendRequest(PlayerData creator, PlayerData target) {
super(creator); super(creator, target);
this.target = target;
} }
public PlayerData getTarget() { @Override
return target; public void whenDenied() {
getTarget().getPlayer().playSound(getTarget().getPlayer().getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 1);
} }
public void deny() { @Override
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId()); public void whenAccepted() {
if(!target.isOnline()) return;
target.getPlayer().playSound(target.getPlayer().getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 1);
}
public void accept() {
getCreator().setLastActivity(PlayerActivity.FRIEND_REQUEST, 0); getCreator().setLastActivity(PlayerActivity.FRIEND_REQUEST, 0);
getCreator().addFriend(target.getUniqueId()); getCreator().addFriend(getTarget().getUniqueId());
target.addFriend(getCreator().getUniqueId()); getTarget().addFriend(getCreator().getUniqueId());
if(target.isOnline() && getCreator().isOnline()) { if (getCreator().isOnline()) {
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", target.getPlayer().getName()).send(getCreator().getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getTarget().getPlayer().getName()).send(getCreator().getPlayer());
MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getCreator().getPlayer().getName()).send(target.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("now-friends", "player", getCreator().getPlayer().getName()).send(getTarget().getPlayer());
} }
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
} }
} }

40
src/main/java/net/Indyuce/mmocore/api/player/social/Request.java
View File

@ -1,31 +1,55 @@
package net.Indyuce.mmocore.api.player.social; package net.Indyuce.mmocore.api.player.social;
import java.util.UUID; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import org.apache.commons.lang.Validate;
import java.util.UUID;
public abstract class Request { public abstract class Request {
private final UUID uuid = UUID.randomUUID(); private final UUID uuid = UUID.randomUUID();
private final long date = System.currentTimeMillis(); private final long date = System.currentTimeMillis();
private final PlayerData creator; private final PlayerData creator, target;
public Request(PlayerData creator) { /**
* Any request time out is by default 2 minutes.
*/
private static final long TIME_OUT = 1000 * 60 * 2;
public Request(PlayerData creator, PlayerData target) {
this.creator = creator; this.creator = creator;
this.target = target;
} }
public PlayerData getCreator() { public PlayerData getCreator() {
return creator; return creator;
} }
public PlayerData getTarget() {
return target;
}
public UUID getUniqueId() { public UUID getUniqueId() {
return uuid; return uuid;
} }
public boolean isTimedOut() { public boolean isTimedOut() {
return date + 1000 * 60 * 2 < System.currentTimeMillis(); return date + TIME_OUT < System.currentTimeMillis();
} }
public abstract void accept(); public void accept() {
Validate.isTrue(target.isOnline(), "Target must be online");
public abstract void deny(); whenAccepted();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
public abstract void whenAccepted();
public void deny() {
Validate.isTrue(target.isOnline(), "Target must be online");
whenDenied();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
}
public abstract void whenDenied();
} }

32
src/main/java/net/Indyuce/mmocore/guild/provided/GuildInvite.java
View File

@ -1,50 +1,44 @@
package net.Indyuce.mmocore.guild.provided; package net.Indyuce.mmocore.guild.provided;
import org.bukkit.Bukkit;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.social.Request; import net.Indyuce.mmocore.api.player.social.Request;
import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.InventoryManager;
import org.bukkit.Bukkit;
public class GuildInvite extends Request { public class GuildInvite extends Request {
private final PlayerData target;
private final Guild guild; private final Guild guild;
public GuildInvite(Guild guild, PlayerData creator, PlayerData target) { public GuildInvite(Guild guild, PlayerData creator, PlayerData target) {
super(creator); super(creator, target);
this.guild = guild; this.guild = guild;
this.target = target;
} }
public Guild getGuild() { public Guild getGuild() {
return guild; return guild;
} }
public PlayerData getPlayer() { @Override
return target; public void whenDenied() {
// Nothing
} }
public void deny() { @Override
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId()); public void whenAccepted() {
}
public void accept() {
guild.removeLastInvite(getCreator().getPlayer()); guild.removeLastInvite(getCreator().getPlayer());
guild.getMembers().forEach(member -> { guild.getMembers().forEach(member -> {
if (Bukkit.getPlayer(member) != null) { if (Bukkit.getPlayer(member) != null) {
MMOCore.plugin.configManager.getSimpleMessage("guild-joined-other", "player", MMOCore.plugin.configManager.getSimpleMessage("guild-joined-other", "player",
target.getPlayer().getName()).send(Bukkit.getPlayer(member)); getTarget().getPlayer().getName()).send(Bukkit.getPlayer(member));
MMOCore.plugin.configManager.getSimpleMessage("guild-joined", "owner", MMOCore.plugin.configManager.getSimpleMessage("guild-joined", "owner",
Bukkit.getPlayer(guild.getOwner()).getName()).send(target.getPlayer()); Bukkit.getPlayer(guild.getOwner()).getName()).send(getTarget().getPlayer());
}} }
}
); );
guild.addMember(target.getUniqueId()); guild.addMember(getTarget().getUniqueId());
InventoryManager.GUILD_VIEW.newInventory(target).open(); InventoryManager.GUILD_VIEW.newInventory(getTarget()).open();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
} }
} }

42
src/main/java/net/Indyuce/mmocore/manager/social/RequestManager.java
View File

@ -1,47 +1,41 @@
package net.Indyuce.mmocore.manager.social; package net.Indyuce.mmocore.manager.social;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.social.Request; import net.Indyuce.mmocore.api.player.social.Request;
import org.bukkit.Bukkit;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
public class RequestManager { public class RequestManager {
private final Set<Request> requests = new HashSet<>(); private final Map<UUID, Request> requests = new HashMap<>();
/* /**
* flush friend requests every 5 minutes so there is no memory overleak * Flushes friend requests every 5 minutes so there is no memory overleak
*/ */
public RequestManager() { public RequestManager() {
Bukkit.getScheduler().runTaskTimer(MMOCore.plugin, this::flushRequests, 60 * 20, 60 * 20 * 5); Bukkit.getScheduler().runTaskTimer(MMOCore.plugin, this::flushRequests, 60 * 20, 60 * 20 * 5);
} }
public Request getRequest(UUID uuid) { public Request getRequest(UUID uuid) {
for (Request request : requests) return requests.get(uuid);
if (request.getUniqueId().equals(uuid))
return request;
return null;
} }
public void registerRequest(Request request) { public void registerRequest(Request request) {
requests.add(request); requests.put(request.getUniqueId(), request);
} }
public void unregisterRequest(UUID uuid) { public void unregisterRequest(UUID uuid) {
for (Iterator<Request> iterator = requests.iterator(); iterator.hasNext();) { requests.remove(uuid);
Request next = iterator.next();
if (next.getUniqueId().equals(uuid)) {
iterator.remove();
break;
}
}
} }
public void flushRequests() { private void flushRequests() {
requests.removeIf(Request::isTimedOut); for (Iterator<Request> iterator = requests.values().iterator(); iterator.hasNext(); ) {
Request next = iterator.next();
if (next.isTimedOut())
iterator.remove();
}
} }
} }

1
src/main/java/net/Indyuce/mmocore/party/provided/Party.java
View File

@ -145,7 +145,6 @@ public class Party implements AbstractParty {
public void sendInvite(PlayerData inviter, PlayerData target) { public void sendInvite(PlayerData inviter, PlayerData target) {
invites.put(target.getUniqueId(), System.currentTimeMillis()); invites.put(target.getUniqueId(), System.currentTimeMillis());
Request request = new PartyInvite(this, inviter, target); Request request = new PartyInvite(this, inviter, target);
if (inviter.isOnline() && target.isOnline())
new ConfigMessage("party-invite").addPlaceholders("player", inviter.getPlayer().getName(), "uuid", request.getUniqueId().toString()) new ConfigMessage("party-invite").addPlaceholders("player", inviter.getPlayer().getName(), "uuid", request.getUniqueId().toString())
.sendAsJSon(target.getPlayer()); .sendAsJSon(target.getPlayer());
MMOCore.plugin.requestManager.registerRequest(request); MMOCore.plugin.requestManager.registerRequest(request);

31
src/main/java/net/Indyuce/mmocore/party/provided/PartyInvite.java
View File

@ -6,43 +6,38 @@ import net.Indyuce.mmocore.api.player.social.Request;
import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.InventoryManager;
public class PartyInvite extends Request { public class PartyInvite extends Request {
private final PlayerData target;
private final Party party; private final Party party;
public PartyInvite(Party party, PlayerData creator, PlayerData target) { public PartyInvite(Party party, PlayerData creator, PlayerData target) {
super(creator); super(creator, target);
this.party = party; this.party = party;
this.target = target;
} }
public Party getParty() { public Party getParty() {
return party; return party;
} }
public PlayerData getPlayer() { @Override
return target; public void whenDenied() {
// Nothing
} }
public void deny() { @Override
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId()); public void whenAccepted() {
}
public void accept() {
if (party.getMembers().size() >= Math.max(2, MMOCore.plugin.getConfig().getInt("party.max-players", 8))) { if (party.getMembers().size() >= Math.max(2, MMOCore.plugin.getConfig().getInt("party.max-players", 8))) {
MMOCore.plugin.configManager.getSimpleMessage("party-is-full").send(target.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("party-is-full").send(getTarget().getPlayer());
return; return;
} }
if (getCreator().isOnline()) if (getCreator().isOnline())
party.removeLastInvite(getCreator().getPlayer()); party.removeLastInvite(getCreator().getPlayer());
party.getMembers().forEach(member -> { party.getMembers().forEach(member -> {
if(member.isOnline() && target.isOnline()) if (member.isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined-other", "player", target.getPlayer().getName()).send(member.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("party-joined-other", "player", getTarget().getPlayer().getName()).send(member.getPlayer());
}); });
if(party.getOwner().isOnline() && target.isOnline()) if (party.getOwner().isOnline())
MMOCore.plugin.configManager.getSimpleMessage("party-joined", "owner", party.getOwner().getPlayer().getName()).send(target.getPlayer()); MMOCore.plugin.configManager.getSimpleMessage("party-joined", "owner", party.getOwner().getPlayer().getName()).send(getTarget().getPlayer());
party.addMember(target); party.addMember(getTarget());
InventoryManager.PARTY_VIEW.newInventory(target).open(); InventoryManager.PARTY_VIEW.newInventory(getTarget()).open();
MMOCore.plugin.requestManager.unregisterRequest(getUniqueId());
} }
} }