mirror of
https://github.com/TotalFreedomMC/TF-Marriage.git
synced 2024-05-29 16:11:24 +00:00
Fixed getPlayer cunctiosn ignoring caps
This commit is contained in:
parent
a5d8ed3739
commit
90e967cb7b
|
@ -12,6 +12,7 @@ import me.lenis0012.mr.commands.MarryCMD;
|
|||
import me.lenis0012.mr.listeners.PlayerListener;
|
||||
import net.milkbowl.vault.economy.Economy;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
@ -81,9 +82,14 @@ public class Marriage extends JavaPlugin
|
|||
|
||||
public Player getPlayer(String name)
|
||||
{
|
||||
Player t = Bukkit.getServer().getPlayer(name);
|
||||
if(t != null)
|
||||
if(t.isOnline())
|
||||
return t;
|
||||
|
||||
for(Player player : this.getServer().getOnlinePlayers())
|
||||
{
|
||||
if(player.getName().toLowerCase().startsWith(name))
|
||||
if(player.getName().toLowerCase().startsWith(name) || player.getName().startsWith(name))
|
||||
{
|
||||
return player;
|
||||
}
|
||||
|
@ -91,7 +97,15 @@ public class Marriage extends JavaPlugin
|
|||
|
||||
for(Player player : this.getServer().getOnlinePlayers())
|
||||
{
|
||||
if(player.getName().toLowerCase().contains(name))
|
||||
if(player.getName().toLowerCase().endsWith(name) || player.getName().endsWith(name))
|
||||
{
|
||||
return player;
|
||||
}
|
||||
}
|
||||
|
||||
for(Player player : this.getServer().getOnlinePlayers())
|
||||
{
|
||||
if(player.getName().toLowerCase().contains(name) || player.getName().contains(name))
|
||||
{
|
||||
return player;
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ public class AcceptCommand
|
|||
|
||||
if(plugin.req.containsKey(player.getName()))
|
||||
{
|
||||
Player op = plugin.getPlayer(plugin.req.get(player.getName().toLowerCase()));
|
||||
Player op = Bukkit.getServer().getPlayer(plugin.req.get(player.getName().toLowerCase()));
|
||||
if(op != null)
|
||||
{
|
||||
if(op.isOnline())
|
||||
|
|
|
@ -51,7 +51,7 @@ public class MarryCommand
|
|||
op.sendMessage(ChatColor.GREEN + player.getName() + " would like to marry with you.");
|
||||
op.sendMessage(ChatColor.GREEN + "Type " + ChatColor.LIGHT_PURPLE + "/marry accept "
|
||||
+ ChatColor.GREEN + "to accept");
|
||||
plugin.req.put(op.getName().toLowerCase(), player.getName());
|
||||
plugin.req.put(op.getName(), player.getName());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name: Marriage
|
||||
version: 1.01
|
||||
version: 1.02
|
||||
main: me.lenis0012.mr.Marriage
|
||||
author: lenis0012
|
||||
dev-url: http://dev.bukkit.org/server-mods/marriage-reloaded/
|
||||
|
|
Loading…
Reference in a new issue