Diff
checker
Text
Text
Images
Documents
Excel
Folders
Legal
Enterprise
Desktop
Pricing
Sign in
Download Diffchecker Desktop
Compare text
Find the difference between two text files
Tools
History
Real-time editor
Hide unchanged lines
Disable line wrap
Layout
Split
Unified
Diff precision
Smart
Word
Char
Syntax highlighting
Choose syntax
Ignore
Transform text
Go to first change
Edit input
Diffchecker Desktop
The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!
Get Desktop
Untitled diff
Created
8 years ago
Diff never expires
Clear
Export
Share
Explain
44 removals
Lines
Total
Removed
Characters
Total
Removed
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
50 lines
Copy
35 additions
Lines
Total
Added
Characters
Total
Added
To continue using this feature, upgrade to
Diff
checker
Pro
View Pricing
41 lines
Copy
if(sub.equalsIgnoreCase("spawn")){
if(sub.equalsIgnoreCase("spawn")){
if(p.hasPermission("potpvp.spawn")){
if(p.hasPermission("potpvp.spawn")){
Copy
Copied
Copy
Copied
if (
Main.instance.getConfig()
.getConfigurationSection("spawn") == null) {
FileConfiguration conf =
Main.instance.getConfig()
;
if (conf
.getConfigurationSection("spawn") == null) {
p.getPlayer().sendMessage("§cThe spawn has not yet been set!");
p.getPlayer().sendMessage("§cThe spawn has not yet been set!");
return true;
return true;
}
}
Copy
Copied
Copy
Copied
if(contadorempezado == false) {
if(listaDePlayersTeletransportando.contains(p.getUniqueId())){
contadorempezado = true;
conf
.getString("messages.spawn-start-cooldown").replace(
"&", "§"); //Que es esto, no mensaje de "ya estas teletransportando"?
Main.instance.getConfig()
.getString("messages.spawn-start-cooldown").replace(
'&', '§');
return true;
new BukkitRunnable(){
}
@EventHandler
listaDePlayersTeletransportando.add(p.getUniqueId());
public void onMove(PlayerMoveEvent e){
conf
.getString("messages.spawn-
start-cooldown")
.replace('&', '§')
;
if(contadorempezado==true){
new BukkitRunnable
(){
e.getPlayer().sendMessage(Main.instance.getConfig()
.getString("messages.spawn-
cancel")
Location stored = p.getLocation().clone();
.replace('&', '§')
)
;
public void run() {
this.cancel();
if(contador > 0) {
}
Location current = p.getLocation();
}
if(current.getX() != stored.getX() && current.getZ() != stored.getZ()) {
public void run
(){
cancel(); //envia mensaje 'countdown cancelled'
if(contador > 1) {
return;
contador = contador-1;
DecimalFormat df = new DecimalFormat("#.#");
p.sendMessage(Bukkit.getPluginManager().getPlugin("PotPvP").getConfig()
.getString("messages.spawn-cooldown").replace('&', '§')
.replace("{time}", df.format(contador)));
} else {
this.cancel();
Main.instance.getConfig().getString("messages.spawn").replace("&", "§");
contador = Main.instance.getConfig().getInt("spawn-cooldown");
World w = Bukkit.getWorld(Main.instance.getConfig().getString("spawn.world"));
double x = Main.instance.getConfig().getDouble("spawn.x");
double y = Main.instance.getConfig().getDouble("spawn.y");
double z = Main.instance.getConfig().getDouble("spawn.z");
p.teleport(new Location(w,x,y,z));
Bukkit.getScheduler().runTaskLater(Main.instance, new Runnable(){
@Override
public void run() {
contadorempezado = false;
}
}, Main.instance.getConfig().getInt("spawn-cooldown")*20L);
}
}
Copy
Copied
Copy
Copied
contador = contador-1;
DecimalFormat df = new DecimalFormat("#.#"); //si contador es un integer, no es necessario..
p.sendMessage(conf.getString("messages.spawn-cooldown").replace('&', '§')
.replace("{time}", df.format(contador)));
} else {
this.cancel();
conf.getString("messages.spawn").replace("&", "§");
contador = conf.getInt("spawn-cooldown");
World w = Bukkit.getWorld(conf.getString("spawn.world"));
double x = conf.getDouble("spawn.x");
double y = conf.getDouble("spawn.y");
double z = conf.getDouble("spawn.z");
p.teleport(new Location(w,x,y,z));
listaDePlayersTeletransportando.remove(p.getUniqueId());
}
}
Copy
Copied
Copy
Copied
}
.runTaskTimer(Main.instance, 20L, 20L);
}
}
.runTaskTimer(Main.instance, 20L, 20L);
}else if(contadorempezado == true){
Main.instance.getConfig().getString("messages.spawn-start-cooldown").replace("&", "§");
}
}
}
}
}
Saved diffs
Original text
Open file
if(sub.equalsIgnoreCase("spawn")){ if(p.hasPermission("potpvp.spawn")){ if (Main.instance.getConfig().getConfigurationSection("spawn") == null) { p.getPlayer().sendMessage("§cThe spawn has not yet been set!"); return true; } if(contadorempezado == false) { contadorempezado = true; Main.instance.getConfig().getString("messages.spawn-start-cooldown").replace('&', '§'); new BukkitRunnable(){ @EventHandler public void onMove(PlayerMoveEvent e){ if(contadorempezado==true){ e.getPlayer().sendMessage(Main.instance.getConfig().getString("messages.spawn-cancel") .replace('&', '§')); this.cancel(); } } public void run(){ if(contador > 1) { contador = contador-1; DecimalFormat df = new DecimalFormat("#.#"); p.sendMessage(Bukkit.getPluginManager().getPlugin("PotPvP").getConfig() .getString("messages.spawn-cooldown").replace('&', '§') .replace("{time}", df.format(contador))); } else { this.cancel(); Main.instance.getConfig().getString("messages.spawn").replace("&", "§"); contador = Main.instance.getConfig().getInt("spawn-cooldown"); World w = Bukkit.getWorld(Main.instance.getConfig().getString("spawn.world")); double x = Main.instance.getConfig().getDouble("spawn.x"); double y = Main.instance.getConfig().getDouble("spawn.y"); double z = Main.instance.getConfig().getDouble("spawn.z"); p.teleport(new Location(w,x,y,z)); Bukkit.getScheduler().runTaskLater(Main.instance, new Runnable(){ @Override public void run() { contadorempezado = false; } }, Main.instance.getConfig().getInt("spawn-cooldown")*20L); } } }.runTaskTimer(Main.instance, 20L, 20L); }else if(contadorempezado == true){ Main.instance.getConfig().getString("messages.spawn-start-cooldown").replace("&", "§"); } } }
Changed text
Open file
if(sub.equalsIgnoreCase("spawn")){ if(p.hasPermission("potpvp.spawn")){ FileConfiguration conf = Main.instance.getConfig(); if (conf.getConfigurationSection("spawn") == null) { p.getPlayer().sendMessage("§cThe spawn has not yet been set!"); return true; } if(listaDePlayersTeletransportando.contains(p.getUniqueId())){ conf.getString("messages.spawn-start-cooldown").replace("&", "§"); //Que es esto, no mensaje de "ya estas teletransportando"? return true; } listaDePlayersTeletransportando.add(p.getUniqueId()); conf.getString("messages.spawn-start-cooldown").replace('&', '§'); new BukkitRunnable(){ Location stored = p.getLocation().clone(); public void run() { if(contador > 0) { Location current = p.getLocation(); if(current.getX() != stored.getX() && current.getZ() != stored.getZ()) { cancel(); //envia mensaje 'countdown cancelled' return; } contador = contador-1; DecimalFormat df = new DecimalFormat("#.#"); //si contador es un integer, no es necessario.. p.sendMessage(conf.getString("messages.spawn-cooldown").replace('&', '§') .replace("{time}", df.format(contador))); } else { this.cancel(); conf.getString("messages.spawn").replace("&", "§"); contador = conf.getInt("spawn-cooldown"); World w = Bukkit.getWorld(conf.getString("spawn.world")); double x = conf.getDouble("spawn.x"); double y = conf.getDouble("spawn.y"); double z = conf.getDouble("spawn.z"); p.teleport(new Location(w,x,y,z)); listaDePlayersTeletransportando.remove(p.getUniqueId()); } } }.runTaskTimer(Main.instance, 20L, 20L); } }
Find difference