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

Commit 94be7cd

Browse files
byRoadrunnerbyRoadrunner
authored
Update 2.1.14.1
Merge development into master
2 parents aba1dea + 163dbe1 commit 94be7cd

File tree

19 files changed

+99
-84
lines changed

19 files changed

+99
-84
lines changed

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
}
1616
stage('Version') {
1717
steps {
18-
sh 'mvn versions:set -DnewVersion=2.1.14'
18+
sh 'mvn versions:set -DnewVersion=2.1.14.1'
1919
}
2020
}
2121
stage('Compile') {

‎README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,32 @@ Use of KVM virtualization or dedicated servers is recommended.
4646

4747
### Developer
4848
If you would like to contribute to this repository, feel free to fork the repo and then create a pull request to our current dev branch.
49+
50+
Maven:
51+
```xml
52+
53+
<repositories>
54+
<repository>
55+
<id>cloudnet-repo</id>
56+
<url>https://cloudnetservice.eu/repositories</url>
57+
</repository>
58+
</repositories>
59+
60+
<dependencies>
61+
<!-- Spigot/BungeeCord -->
62+
<dependency>
63+
<groupId>de.dytanic.cloudnet</groupId>
64+
<artifactId>cloudnet-api-bridge</artifactId>
65+
<version>2.1.14</version>
66+
<scope>provided</scope>
67+
</dependency>
68+
<!-- CloudNet Core -->
69+
<dependency>
70+
<groupId>de.dytanic.cloudnet</groupId>
71+
<artifactId>cloudnet-core</artifactId>
72+
<version>2.1.14</version>
73+
<scope>provided</scope>
74+
</dependency>
75+
</dependencies>
76+
77+
```

‎cloudnet-api/cloudnet-api-core/src/main/java/de/dytanic/cloudnet/api/player/PermissionProvider.java‎

Lines changed: 52 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
import de.dytanic.cloudnet.lib.player.permission.*;
66

77
import java.text.SimpleDateFormat;
8-
import java.util.ArrayList;
9-
import java.util.Collection;
10-
import java.util.Collections;
11-
import java.util.UUID;
8+
import java.util.*;
129
import java.util.concurrent.TimeUnit;
1310

1411
@SuppressWarnings({"unused", "WeakerAccess"})
@@ -175,12 +172,10 @@ public static String getGroupName(UUID uuid)
175172
*/
176173
public static String getGroupPrefix(String groupName)
177174
{
178-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
175+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
179176
if (permissionPool.getGroups().containsKey(groupName))
180-
{
181-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
182-
return permissionGroup.getPrefix();
183-
}
177+
return permissionPool.getGroups().get(groupName).getPrefix();
178+
184179
return null;
185180
}
186181

@@ -195,12 +190,10 @@ public static String getGroupPrefix(String groupName)
195190
*/
196191
public static String getGroupSuffix(String groupName)
197192
{
198-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
193+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
199194
if (permissionPool.getGroups().containsKey(groupName))
200-
{
201-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
202-
return permissionGroup.getSuffix();
203-
}
195+
return permissionPool.getGroups().get(groupName).getSuffix();
196+
204197
return null;
205198
}
206199

@@ -226,12 +219,10 @@ public static boolean isInGroup(String groupName, OfflinePlayer offlinePlayer)
226219
*/
227220
public static String getGroupDisplay(String groupName)
228221
{
229-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
222+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
230223
if (permissionPool.getGroups().containsKey(groupName))
231-
{
232-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
233-
return permissionGroup.getDisplay();
234-
}
224+
return permissionPool.getGroups().get(groupName).getDisplay();
225+
235226
return null;
236227
}
237228

@@ -245,12 +236,10 @@ public static String getGroupDisplay(String groupName)
245236
*/
246237
public static Collection<String> getImplementedGroups(String groupName)
247238
{
248-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
239+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
249240
if (permissionPool.getGroups().containsKey(groupName))
250-
{
251-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
252-
return Collections.unmodifiableCollection(permissionGroup.getImplementGroups());
253-
}
241+
return Collections.unmodifiableCollection(permissionPool.getGroups().get(groupName).getImplementGroups());
242+
254243
return null;
255244
}
256245

@@ -275,12 +264,10 @@ public static int getJoinPower(OfflinePlayer player)
275264
*/
276265
public static Integer getGroupJoinPower(String groupName)
277266
{
278-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
267+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
279268
if (permissionPool.getGroups().containsKey(groupName))
280-
{
281-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
282-
return permissionGroup.getJoinPower();
283-
}
269+
return permissionPool.getGroups().get(groupName).getJoinPower();
270+
284271
return null;
285272
}
286273

@@ -347,7 +334,7 @@ public static void removePlayerPermission(OfflinePlayer offlinePlayer, String pe
347334
*/
348335
public static void addPermission(String permissionGroupName, String permission)
349336
{
350-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
337+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
351338
if (permissionPool.getGroups().containsKey(permissionGroupName))
352339
{
353340
PermissionGroup permissionGroup = permissionPool.getGroups().get(permissionGroupName);
@@ -365,7 +352,7 @@ public static void addPermission(String permissionGroupName, String permission)
365352
*/
366353
public static void removePermission(String permissionGroupName, String permission)
367354
{
368-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
355+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
369356
if (permissionPool.getGroups().containsKey(permissionGroupName))
370357
{
371358
PermissionGroup permissionGroup = permissionPool.getGroups().get(permissionGroupName);
@@ -383,9 +370,9 @@ public static void removePermission(String permissionGroupName, String permissio
383370
* @param permission the permission to add
384371
* @param serverGroup the server group to restrict the permission to
385372
*/
386-
public static void addServergroupPermission(String permissionGroupName, String permission, String serverGroup)
373+
public static void addServerGroupPermission(String permissionGroupName, String permission, String serverGroup)
387374
{
388-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
375+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
389376
if (permissionPool.getGroups().containsKey(permissionGroupName))
390377
{
391378
PermissionGroup permissionGroup = permissionPool.getGroups().get(permissionGroupName);
@@ -409,18 +396,15 @@ public static void addServergroupPermission(String permissionGroupName, String p
409396
*/
410397
public static void removeServerGroupPermission(String permissionGroupName, String permission, String serverGroup)
411398
{
412-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
399+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
413400
if (permissionPool.getGroups().containsKey(permissionGroupName))
414401
{
415402
PermissionGroup permissionGroup = CloudAPI.getInstance().getPermissionGroup(permissionGroupName);
416-
if (permissionGroup == null)
417-
{
418-
return;
419-
}
403+
if (permissionGroup == null) return;
404+
420405
if (!permissionGroup.getServerGroupPermissions().containsKey(permission))
421-
{
422406
permissionGroup.getServerGroupPermissions().put(permission, new ArrayList<>());
423-
}
407+
424408
permissionGroup.getServerGroupPermissions().get(serverGroup).remove(permission.replaceFirst("-", ""));
425409
updatePermissionGroup(permissionGroup);
426410
}
@@ -436,7 +420,7 @@ public static void removeServerGroupPermission(String permissionGroupName, Strin
436420
*/
437421
public static void setPlayerGroup(OfflinePlayer offlinePlayer, String groupName, long time)
438422
{
439-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
423+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
440424
if (permissionPool.getGroups().containsKey(groupName))
441425
{
442426
offlinePlayer.getPermissionEntity().getGroups().clear();
@@ -456,7 +440,7 @@ public static void setPlayerGroup(OfflinePlayer offlinePlayer, String groupName,
456440
*/
457441
public static void addPlayerGroup(OfflinePlayer player, String groupName, long time)
458442
{
459-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
443+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
460444
if (permissionPool.getGroups().containsKey(groupName))
461445
{
462446
player.getPermissionEntity().getGroups().add(new GroupEntityData(groupName,
@@ -474,15 +458,16 @@ public static void addPlayerGroup(OfflinePlayer player, String groupName, long t
474458
*/
475459
public static void removePlayerGroup(String groupName, OfflinePlayer offlinePlayer)
476460
{
477-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
478-
offlinePlayer.getPermissionEntity().getGroups().stream()
479-
.filter(e -> e.getGroup().equals(groupName))
480-
.forEach(e -> offlinePlayer.getPermissionEntity().getGroups().remove(e));
461+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
462+
final List<GroupEntityData> groupEntityData = new ArrayList<>(offlinePlayer.getPermissionEntity().getGroups());
463+
groupEntityData.forEach(group -> {
464+
if (group.getGroup().equals(groupName))
465+
offlinePlayer.getPermissionEntity().getGroups().remove(group);
466+
});
481467

482468
if (offlinePlayer.getPermissionEntity().getGroups().size() == 0)
483-
{
484469
offlinePlayer.getPermissionEntity().getGroups().add(new GroupEntityData(permissionPool.getDefaultGroup().getName(), 0));
485-
}
470+
486471
updatePlayer(offlinePlayer);
487472
}
488473

@@ -527,11 +512,10 @@ public static Collection<PermissionGroup> getGroups()
527512
*/
528513
public static PermissionGroup getPermissionGroup(String groupName)
529514
{
530-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
515+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
531516
if (permissionPool.getGroups().containsKey(groupName))
532-
{
533517
return permissionPool.getGroups().get(groupName);
534-
}
518+
535519
return null;
536520
}
537521

@@ -543,10 +527,10 @@ public static PermissionGroup getPermissionGroup(String groupName)
543527
*/
544528
public static void setDisplay(String groupName, String display)
545529
{
546-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
530+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
547531
if (permissionPool.getGroups().containsKey(groupName))
548532
{
549-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
533+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
550534
permissionGroup.setDisplay(display);
551535
updatePermissionGroup(permissionGroup);
552536
}
@@ -560,10 +544,10 @@ public static void setDisplay(String groupName, String display)
560544
*/
561545
public static void setPrefix(String groupName, String prefix)
562546
{
563-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
547+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
564548
if (permissionPool.getGroups().containsKey(groupName))
565549
{
566-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
550+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
567551
permissionGroup.setPrefix(prefix);
568552
updatePermissionGroup(permissionGroup);
569553
}
@@ -577,10 +561,10 @@ public static void setPrefix(String groupName, String prefix)
577561
*/
578562
public static void setSuffix(String groupName, String suffix)
579563
{
580-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
564+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
581565
if (permissionPool.getGroups().containsKey(groupName))
582566
{
583-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
567+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
584568
permissionGroup.setSuffix(suffix);
585569
updatePermissionGroup(permissionGroup);
586570
}
@@ -593,14 +577,14 @@ public static void setSuffix(String groupName, String suffix)
593577
*/
594578
public static void setDefaultGroup(String groupName)
595579
{
596-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
580+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
597581
if (permissionPool.getGroups().containsKey(groupName))
598582
{
599-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
600-
PermissionGroup olddefault = permissionPool.getDefaultGroup();
601-
olddefault.setDefaultGroup(false);
583+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
584+
final PermissionGroup old = permissionPool.getDefaultGroup();
585+
old.setDefaultGroup(false);
602586
permissionGroup.setDefaultGroup(true);
603-
updatePermissionGroup(olddefault);
587+
updatePermissionGroup(old);
604588
updatePermissionGroup(permissionGroup);
605589
}
606590
}
@@ -613,10 +597,10 @@ public static void setDefaultGroup(String groupName)
613597
*/
614598
public static void setJoinPower(String groupName, int joinPower)
615599
{
616-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
600+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
617601
if (permissionPool.getGroups().containsKey(groupName))
618602
{
619-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
603+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
620604
permissionGroup.setJoinPower(joinPower);
621605
updatePermissionGroup(permissionGroup);
622606
}
@@ -630,10 +614,10 @@ public static void setJoinPower(String groupName, int joinPower)
630614
*/
631615
public static void setTagID(String groupName, int tagId)
632616
{
633-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
617+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
634618
if (permissionPool.getGroups().containsKey(groupName))
635619
{
636-
PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
620+
final PermissionGroup permissionGroup = permissionPool.getGroups().get(groupName);
637621
permissionGroup.setTagId(tagId);
638622
updatePermissionGroup(permissionGroup);
639623
}
@@ -648,10 +632,10 @@ public static void setTagID(String groupName, int tagId)
648632
*/
649633
public PermissionGroup createPermissionGroup(String permissionGroupName)
650634
{
651-
PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
635+
final PermissionPool permissionPool = CloudAPI.getInstance().getPermissionPool();
652636
if (!permissionPool.getGroups().containsKey(permissionGroupName))
653637
{
654-
PermissionGroup permissionGroup = new DefaultPermissionGroup(permissionGroupName);
638+
final PermissionGroup permissionGroup = new DefaultPermissionGroup(permissionGroupName);
655639
CloudAPI.getInstance().updatePermissionGroup(permissionGroup);
656640
return permissionGroup;
657641
}

‎cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/NetworkManager.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,7 @@ public boolean accept(INetworkComponent networkComponent)
350350

351351
public NetworkManager sendAll(Packet packet, ChannelFilter filter)
352352
{
353-
this.executorService.submit(new Runnable() {
354-
@Override
355-
public void run()
356-
{
353+
this.executorService.submit(() -> {
357354
for (Wrapper cn : CloudNet.getInstance().getWrappers().values())
358355
{
359356
if (cn.getChannel() != null && filter.accept(cn))
@@ -371,9 +368,7 @@ public void run()
371368
if (cloudServer.getChannel() != null && filter.accept(cloudServer))
372369
cloudServer.sendPacket(packet);
373370

374-
}
375-
}
376-
});
371+
}});
377372
return this;
378373
}
379374

‎cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/in/PacketInSendScreenLine.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,24 @@
1313
import de.dytanic.cloudnetcore.api.event.server.ScreenInfoEvent;
1414
import de.dytanic.cloudnetcore.network.components.INetworkComponent;
1515

16+
import java.lang.reflect.Type;
1617
import java.util.Collection;
1718

18-
public class PacketInSendScreenLine extends PacketInHandler {
19+
public final class PacketInSendScreenLine extends PacketInHandler {
20+
21+
private static final Type TYPE = new TypeToken<Collection<ScreenInfo>>() {
22+
}.getType();
1923

2024
@Override
2125
public void handleInput(Document data, PacketSender packetSender)
2226
{
23-
Collection<ScreenInfo> screenInfos = data.getObject("screenInfo", new TypeToken<Collection<ScreenInfo>>() {
24-
}.getType());
27+
Collection<ScreenInfo> screenInfos = data.getObject("screenInfo", TYPE);
2528
CloudNet.getInstance().getEventManager().callEvent(new ScreenInfoEvent(screenInfos));
2629

2730
for (ScreenInfo screenInfo : screenInfos)
2831
{
29-
if (CloudNet.getInstance().getScreenProvider().getMainServiceId() != null && screenInfo.getServiceId().getServerId().equalsIgnoreCase(CloudNet.getInstance().getScreenProvider().getMainServiceId().getServerId()))
32+
if (CloudNet.getInstance().getScreenProvider().getMainServiceId() != null &&
33+
screenInfo.getServiceId().getServerId().equalsIgnoreCase(CloudNet.getInstance().getScreenProvider().getMainServiceId().getServerId()))
3034
System.out.println("[" + screenInfo.getServiceId().getServerId() + "] " + screenInfo.getLine());
3135
}
3236

0 commit comments

Comments
 (0)