Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit 62263e9

Browse files
author
Tareko
authored
Merge pull request #37 from CloudNetService/2.1.10
Merge branch 2.1.10 with master
2 parents 5584f54 + 63e0861 commit 62263e9

File tree

118 files changed

+1883
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1883
-972
lines changed

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/proxied/CommandCloud.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -534,31 +534,31 @@ public boolean isAccepted(Template value)
534534
commandSender.sendMessages(
535535
NetworkUtils.SPACE_STRING,
536536
CloudAPI.getInstance().getPrefix() + "All command arguments",
537-
"§7/cloud toggle autoslot",
538-
"§7/cloud toggle maintenance",
539-
"§7/cloud toggle maintenance <time>",
540-
"§7/cloud setMaxPlayers <maxonlinecount>",
541-
"§7/cloud whitelist <add : remove> <name>",
542-
"§7/cloud start <group> <count>",
543-
"§7/cloud start <group> <template>",
544-
"§7/cloud startcs <name> <memory> <priorityStop>",
545-
"§7/cloud cmds (command server) <server> <command>",
546-
"§7/cloud cmdp (command proxy) <proxy> <command>",
547-
"§7/cloud stop <serverId>",
548-
"§7/cloud stopGroup <group>",
549-
"§7/cloud ustopGroup <group>",
550-
"§7/cloud listProxys",
551-
"§7/cloud listOnline",
552-
"§7/cloud listServers",
553-
"§7/cloud log <server>",
554-
"§7/cloud listGroups",
555-
"§7/cloud rl",
556-
"§7/cloud list",
557-
"§7/cloud maintenance <group>",
558-
"§7/cloud copy <server>",
559-
"§7/cloud copy <server> <directory>",
560-
"§7/cloud version",
561-
"§7/cloud statistics",
537+
CloudAPI.getInstance().getPrefix() + "§7/cloud toggle autoslot",
538+
CloudAPI.getInstance().getPrefix() + "§7/cloud toggle maintenance",
539+
CloudAPI.getInstance().getPrefix() + "§7/cloud toggle maintenance <time>",
540+
CloudAPI.getInstance().getPrefix() + "§7/cloud setMaxPlayers <maxonlinecount>",
541+
CloudAPI.getInstance().getPrefix() + "§7/cloud whitelist <add : remove> <name>",
542+
CloudAPI.getInstance().getPrefix() + "§7/cloud start <group> <count>",
543+
CloudAPI.getInstance().getPrefix() + "§7/cloud start <group> <template>",
544+
CloudAPI.getInstance().getPrefix() + "§7/cloud startcs <name> <memory> <priorityStop>",
545+
CloudAPI.getInstance().getPrefix() + "§7/cloud cmds (command server) <server> <command>",
546+
CloudAPI.getInstance().getPrefix() + "§7/cloud cmdp (command proxy) <proxy> <command>",
547+
CloudAPI.getInstance().getPrefix() + "§7/cloud stop <serverId>",
548+
CloudAPI.getInstance().getPrefix() + "§7/cloud stopGroup <group>",
549+
CloudAPI.getInstance().getPrefix() + "§7/cloud ustopGroup <group>",
550+
CloudAPI.getInstance().getPrefix() + "§7/cloud listProxys",
551+
CloudAPI.getInstance().getPrefix() + "§7/cloud listOnline",
552+
CloudAPI.getInstance().getPrefix() + "§7/cloud listServers",
553+
CloudAPI.getInstance().getPrefix() + "§7/cloud log <server>",
554+
CloudAPI.getInstance().getPrefix() + "§7/cloud listGroups",
555+
CloudAPI.getInstance().getPrefix() + "§7/cloud rl",
556+
CloudAPI.getInstance().getPrefix() + "§7/cloud list",
557+
CloudAPI.getInstance().getPrefix() + "§7/cloud maintenance <group>",
558+
CloudAPI.getInstance().getPrefix() + "§7/cloud copy <server>",
559+
CloudAPI.getInstance().getPrefix() + "§7/cloud copy <server> <directory>",
560+
CloudAPI.getInstance().getPrefix() + "§7/cloud version",
561+
CloudAPI.getInstance().getPrefix() + "§7/cloud statistics",
562562
NetworkUtils.SPACE_STRING
563563
);
564564
break;

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/proxied/CommandPermissions.java

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -429,27 +429,29 @@ public void execute(CommandSender sender, String[] args)
429429
}
430430
} else
431431
{
432-
sender.sendMessage("CloudNet-Permissions: [\"_\" = \" \"]");
433-
sender.sendMessage(NetworkUtils.SPACE_STRING);
434-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms CREATE <groupName>");
435-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP");
436-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name>");
437-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> add permission <permission>");
438-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> remove permission <permission>");
439-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> add permission <permission> <group>");
440-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> remove permission <permission> <group>");
441-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setDisplay <display>");
442-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setJoinPower <joinPower>");
443-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setSuffix <suffix>");
444-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setPrefix <prefix>");
445-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setTagId <tagId>");
446-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setDefault <true : false>");
447-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user>");
448-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP SET <name> <lifetime | time in days> ");
449-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP ADD <name> <lifetime | time in days> ");
450-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP REMOVE <name>");
451-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user> ADD PERMISSION <permission>");
452-
sender.sendMessage(CloudAPI.getInstance().getPrefix() + "/cperms USER <user> REMOVE PERMISSION <permission>");
432+
sender.sendMessages(
433+
"CloudNet-Permissions: [\"_\" = \" \"]",
434+
NetworkUtils.SPACE_STRING,
435+
CloudAPI.getInstance().getPrefix() + "/cperms CREATE <groupName>",
436+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP",
437+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name>",
438+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> add permission <permission>",
439+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> remove permission <permission>",
440+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> add permission <permission> <group>",
441+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> remove permission <permission> <group>",
442+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setDisplay <display>",
443+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setJoinPower <joinPower>",
444+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setSuffix <suffix>",
445+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setPrefix <prefix>",
446+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setTagId <tagId>",
447+
CloudAPI.getInstance().getPrefix() + "/cperms GROUP <name> setDefault <true : false>",
448+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user>",
449+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP SET <name> <lifetime | time in days> ",
450+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP ADD <name> <lifetime | time in days> ",
451+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user> GROUP REMOVE <name>",
452+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user> ADD PERMISSION <permission>",
453+
CloudAPI.getInstance().getPrefix() + "/cperms USER <user> REMOVE PERMISSION <permission>"
454+
);
453455
}
454456
}
455457

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/packetio/PacketOutProxyPing.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import de.dytanic.cloudnet.lib.network.protocol.packet.PacketRC;
55
import de.dytanic.cloudnet.lib.utility.document.Document;
66

7-
public final class PacketOutProxyPing extends Packet {
7+
public final class PacketOutProxyPing extends Packet {
88

99
public PacketOutProxyPing()
1010
{

‎cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissble.java

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,41 +24,48 @@ public class CloudPermissble extends PermissibleBase {
2424

2525
private UUID uniqueId;
2626

27-
public CloudPermissble(Player player) {
27+
public CloudPermissble(Player player)
28+
{
2829
super(player);
2930
this.uniqueId = player.getUniqueId();
3031

3132
player.setOp(false);
3233
}
3334

3435
@Override
35-
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
36+
public Set<PermissionAttachmentInfo> getEffectivePermissions()
37+
{
3638
final Map<String, Boolean> permissions = CloudServer.getInstance().getCloudPlayers().get(this.uniqueId).getPermissionEntity().getPermissions();
3739
Set<PermissionAttachmentInfo> set = new HashSet<>();
38-
for (Map.Entry<String, Boolean> entry : permissions.entrySet()) {
40+
for (Map.Entry<String, Boolean> entry : permissions.entrySet())
41+
{
3942
PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, entry.getKey(), null, entry.getValue());
4043
set.add(permissionAttachmentInfo);
4144
}
4245
return set;
4346
}
4447

4548
@Override
46-
public boolean isPermissionSet(String name) {
49+
public boolean isPermissionSet(String name)
50+
{
4751
return hasPermission(name);
4852
}
4953

5054
@Override
51-
public boolean isPermissionSet(Permission perm) {
55+
public boolean isPermissionSet(Permission perm)
56+
{
5257
return hasPermission(perm.getName());
5358
}
5459

5560
@Override
56-
public boolean hasPermission(Permission perm) {
61+
public boolean hasPermission(Permission perm)
62+
{
5763
return hasPermission(perm.getName());
5864
}
5965

6066
@Override
61-
public boolean hasPermission(String inName) {
67+
public boolean hasPermission(String inName)
68+
{
6269
if (inName.equalsIgnoreCase("bukkit.broadcast.user")) return true;
6370

6471
CloudPlayer cloudPlayer = CloudServer.getInstance().getCloudPlayers().get(this.uniqueId);
@@ -69,11 +76,13 @@ public boolean hasPermission(String inName) {
6976
}
7077

7178
@Override
72-
public boolean isOp() {
79+
public boolean isOp()
80+
{
7381
return false;
7482
}
7583

76-
public UUID getUniqueId() {
84+
public UUID getUniqueId()
85+
{
7786
return uniqueId;
7887
}
7988
}

‎cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareConfig.java

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,40 @@
1010
import java.util.Collection;
1111

1212
/**
13-
* Created by Tareko on 23.08.2017.
13+
* Container for the CloudFlare configuration.
1414
*/
1515
@Getter
1616
@AllArgsConstructor
1717
public class CloudFlareConfig {
1818

19+
/**
20+
* Whether or not the module is enabled
21+
*/
1922
private boolean enabled;
2023

24+
/**
25+
* The E-Mail address of the account to use.
26+
*/
2127
private String email;
2228

29+
/**
30+
* The token to authenticate at the CloudFlare API with.
31+
*/
2332
private String token;
2433

34+
/**
35+
* The domain to create records for.
36+
*/
2537
private String domainName;
2638

39+
/**
40+
* The internal zone ID at CloudFlare
41+
*/
2742
private String zoneId;
2843

44+
/**
45+
* All configured BungeeCord groups and their sub-domains
46+
*/
2947
private Collection<CloudFlareProxyGroup> groups;
3048

31-
}
49+
}

‎cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareProxyGroup.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import lombok.ToString;
1111

1212
/**
13-
* Created by Tareko on 23.08.2017.
13+
* Container for a CloudFlare proxy group.
1414
*/
1515
@Getter
1616
@ToString
@@ -19,13 +19,13 @@
1919
public class CloudFlareProxyGroup {
2020

2121
/**
22-
* BungeeCord Group Name
22+
* Name of the BungeeCord group
2323
*/
2424
private String name;
2525

2626
/**
27-
* SubDomain Name
27+
* Name of the sub-domain
2828
*/
2929
private String sub;
3030

31-
}
31+
}

0 commit comments

Comments
 (0)