This repository has been archived by the owner on Jun 7, 2022. It is now read-only.

Merge for update to 2.1.15 #106

Merged

58 commits merged into master from development

May 21, 2019

Member

GiantTreeLP commented Mar 1, 2019 •

edited

Loading

Noteworthy changes:

Update the API-Bridge to Minecraft 1.14
Properly fixed plugins that use the effective permission set (e.g. PlotSquared)
Fixed issues with the CloudFlare DNS module
Add /cloud debug, /cloudserver debug commands
Add more debugging output to the proxy and server log
Sort the highest group by the lowest tagId to allow for more intuitive understanding
Allow negative wildcard permissions for global permissions (note: not for servergroup permissions)

Tarek and others added 10 commits

January 26, 2019 20:09


          removed paper

ba1c190


          Bump dependency.netty.version from 4.1.32.Final to 4.1.33.Final

737efa3

Bumps `dependency.netty.version` from 4.1.32.Final to 4.1.33.Final.

Updates `netty-transport-native-epoll` from 4.1.32.Final to 4.1.33.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.32.Final...netty-4.1.33.Final)

Updates `netty-transport-native-kqueue` from 4.1.32.Final to 4.1.33.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.32.Final...netty-4.1.33.Final)

Updates `netty-codec` from 4.1.32.Final to 4.1.33.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.32.Final...netty-4.1.33.Final)

Updates `netty-handler` from 4.1.32.Final to 4.1.33.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.32.Final...netty-4.1.33.Final)

Updates `netty-codec-http` from 4.1.32.Final to 4.1.33.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.32.Final...netty-4.1.33.Final)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          removed stacktrace because

415a844


          Merge branch 'development' of https://github.com/CloudNetService/Clou…

441bf0a

…dNet into development


          Bump typetools from 0.6.0 to 0.6.1

835ebf1

Bumps [typetools](https://github.com/jhalterman/typetools) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/jhalterman/typetools/releases)
- [Changelog](https://github.com/jhalterman/typetools/blob/master/CHANGELOG.md)
- [Commits](jhalterman/typetools@typetools-0.6.0...typetools-0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Bump lombok from 1.18.4 to 1.18.6

b0ec0b0

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.4 to 1.18.6.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](projectlombok/lombok@v1.18.4...v1.18.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Fix incomplete set of effective permissions.

fdcf4d4

Closes #104

Signed-off-by: Marvin <marv.1997@live.de>


          Collect implemented groups to gather their permissions for the effect…

25442d8

…ive permission set.

Closes #104

Signed-off-by: Marvin <marv.1997@live.de>


          added dns record remove failure message + break the while condition

e9f7d1d


          removed while loop

064a87b

GiantTreeLP added the release label

GiantTreeLP self-assigned this

GiantTreeLP requested a review from byRoadrunner

March 1, 2019 13:38

byRoadrunner and others added 5 commits

March 1, 2019 15:08


          Update README.md

ccbde76

Removed Codacy Badge


          Changed Vault Repo

d399e13

Added a temporary fix for the offline Vault repo


          Bump Vault-API version

a9f3cad


          Merge pull request #108 from CloudNetService/byRoadrunner-fix-vault

42b241f

Changed Vault Repo


          Fixed groupId of Vault

06a46cb

codeclimate bot reviewed

View reviewed changes

cloudnet-cord/cloudnet-log/src/main/java/de/dytanic/cloudnet/logging/CloudLogger.java Show resolved Hide resolved

cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/setup/SetupSpigotVersion.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

Tarek added 2 commits

March 1, 2019 19:03


          finally fixed cloudflare bug

1811c30


          Merge branch 'development' of https://github.com/CloudNetService/Clou…

f3f9688

…dNet into development

codeclimate bot reviewed

View reviewed changes

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

cloudnet-wrapper/src/main/java/de/dytanic/cloudnetwrapper/setup/SetupSpigotVersion.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved


          Exclude bukkit from VaultAPI dependency

0e437e7

codeclimate bot reviewed

View reviewed changes

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java

                       for (MultiValue<PostResponse, String> id : cloudFlareDatabase.getAndRemove().values())
                       {
+                          if (id.getFirst() == null) continue;

codeclimate bot Mar 1, 2019

'if' construct must use '{}'s.

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java Show resolved Hide resolved

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java Show resolved Hide resolved

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java

-                                  System.out.println(prefix + " DNSRecord [" + postResponse.getId() + "] was removed");
-                              }
+                                  System.out.println(prefix + "DNSRecord [" + postResponse.getId() + "] was removed");
+                              } else

codeclimate bot Mar 1, 2019

'else' construct must use '{}'s.


          Bump snakeyaml from 1.23 to 1.24

e5d184f

Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.23 to 1.24.
- [Commits](https://bitbucket.org/asomov/snakeyaml/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

codeclimate bot reviewed

View reviewed changes

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java Show resolved Hide resolved

...cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java

-                          {
-                              stringBuilder.append(input);
-                          }
+                          while ((input = bufferedReader.readLine()) != null) stringBuilder.append(input);

codeclimate bot Mar 1, 2019

'while' construct must use '{}'s.

cloudnet-cord/cloudnet-log/src/main/java/de/dytanic/cloudnet/logging/CloudLogger.java Show resolved Hide resolved

...et-modules-cloudflare/src/main/java/de/dytanic/cloudnetcore/cloudflare/CloudFlareModule.java

                           CloudFlareService.getInstance().shutdown(cloudFlareDatabase);
-                      } catch (Exception ex)
+                      } catch (Exception ignored)

codeclimate bot Mar 1, 2019

Empty catch block.

GiantTreeLP added 4 commits

March 1, 2019 20:27


          Add logger to CloudAPI and initialize it in the bootstrap classes,

1e0299d

add debug subcommand to /cloud and /cloudserver

Signed-off-by: Marvin <marv.1997@live.de>


          Add debug output and rewrite parts of VaultPermissionImpl.java (fix g…

a85f0a6

…roupHas)

Signed-off-by: Marvin <marv.1997@live.de>


          Add debug output to the ProxiedListener.java

3c16425

Signed-off-by: Marvin <marv.1997@live.de>


          Add debug output to BukkitListener.java

7e0664b

Signed-off-by: Marvin <marv.1997@live.de>

Tarek added 2 commits

March 15, 2019 20:40


          reformat code + set delay to 25 milliseconds


          Merge branch 'development' of https://github.com/CloudNetService/Clou…

48eaf6a

…dNet into development

codeclimate bot reviewed

View reviewed changes

...dnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java Show resolved Hide resolved

...dge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/bukkit/CommandCloudServer.java Show resolved Hide resolved

...bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/bukkit/CommandResource.java Show resolved Hide resolved

...i-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/proxied/CommandCloud.java Show resolved Hide resolved

...api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/command/proxied/CommandHub.java Show resolved Hide resolved

codeclimate bot commented Mar 15, 2019

Code Climate has analyzed commit 48eaf6a and detected 70 issues on this pull request.

Here's the issue category breakdown:

Category	Count
Complexity	4
Duplication	13
Style	47
Clarity	3
Bug Risk	3

Note: there are 2 critical issues.

View more on Code Climate.

dependabot-support and others added 12 commits

April 22, 2019 13:24


          Bump maven-javadoc-plugin from 3.0.1 to 3.1.0

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.0.1...maven-javadoc-plugin-3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Bump dependency.netty.version from 4.1.34.Final to 4.1.35.Final

4a61c3a

Bumps `dependency.netty.version` from 4.1.34.Final to 4.1.35.Final.

Updates `netty-transport-native-epoll` from 4.1.34.Final to 4.1.35.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.34.Final...netty-4.1.35.Final)

Updates `netty-transport-native-kqueue` from 4.1.34.Final to 4.1.35.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.34.Final...netty-4.1.35.Final)

Updates `netty-codec` from 4.1.34.Final to 4.1.35.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.34.Final...netty-4.1.35.Final)

Updates `netty-handler` from 4.1.34.Final to 4.1.35.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.34.Final...netty-4.1.35.Final)

Updates `netty-codec-http` from 4.1.34.Final to 4.1.35.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.34.Final...netty-4.1.35.Final)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Print the StackTrace when a ServerGroup-file couldn't be loaded


          Make calling of CloudServer events sync to prevent issues with Spigot…

d96b83b

… 1.14


          Make BukkitCloudEvent async

4d137d5


          Change sorting of a players permissionGroups via joinPower to sorting…

e40e469

… via tagId


          Change PermissionProvider to return the highest joinPower of a player

e3b6cd8


          Add Java streams to get highest permission group

82e9112


          Fix SignSelector and MobSelector to work on every MC Version

1736d2d

Fix BukkitCloudEvent
Add materialNames to config-objects containing materialIds
Use 1.13+ material names with original defaults


          Change every spigot-dependency to the spigot-api

cdbce2f


          Add check wallSign-check in SignSelector

cf7c7f2


          Fixed #114

5a246f9

Add team color
- new config parameter
- new command parameter(perms group <group> setColor <colorcode(&c)>)
  * Bungee
  * Master
 - Fallback color from 2.1.14.3 if color not set
  * Get last color of prefix and set as team color

Member Author

GiantTreeLP commented Apr 27, 2019

Fixes #41

GiantTreeLP and others added 5 commits

April 28, 2019 01:39


          Refactor and fix logger calls to use proper String formatting

Signed-off-by: Marvin <marv.1997@live.de>


          Finally fix the debug output in spigot by changing the log4j context …

8e5e847

…and configuration. This only affects the log file

Signed-off-by: Marvin <marv.1997@live.de>


          Bump dependency.netty.version from 4.1.35.Final to 4.1.36.Final

92d2953

Bumps `dependency.netty.version` from 4.1.35.Final to 4.1.36.Final.

Updates `netty-transport-native-epoll` from 4.1.35.Final to 4.1.36.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.35.Final...netty-4.1.36.Final)

Updates `netty-transport-native-kqueue` from 4.1.35.Final to 4.1.36.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.35.Final...netty-4.1.36.Final)

Updates `netty-codec` from 4.1.35.Final to 4.1.36.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.35.Final...netty-4.1.36.Final)

Updates `netty-handler` from 4.1.35.Final to 4.1.36.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.35.Final...netty-4.1.36.Final)

Updates `netty-codec-http` from 4.1.35.Final to 4.1.36.Final
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](netty/netty@netty-4.1.35.Final...netty-4.1.36.Final)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Return the actual permission value instead of true for wildcard permi…

c009ee5

…ssions.

This fixes negative wildcard permissions

Signed-off-by: Marvin <marv.1997@live.de>


          Update README.md

0176c28

Member Author

GiantTreeLP commented May 3, 2019 •

edited by byRoadrunner

Loading

I have added a proper changelog.

Feel free to merge as soon as possible @byRoadrunner .
This version has been tested on Minecraft 1.8.8 and 1.13.2, as well as 1.14 and works as advertised.

GiantTreeLP and others added 5 commits

May 3, 2019 22:30


          Update README.md

1fc4753


          Bump lombok from 1.18.6 to 1.18.8

c39dfd2

Bumps [lombok](https://github.com/rzwitserloot/lombok) from 1.18.6 to 1.18.8.
- [Release notes](https://github.com/rzwitserloot/lombok/releases)
- [Changelog](https://github.com/rzwitserloot/lombok/blob/master/doc/changelog.markdown)
- [Commits](projectlombok/lombok@v1.18.6...v1.18.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Add missing deprecates

203233d

Simplify getting of permissionGroup
Remove useless Optional
Remove useless method


          Bump maven-jar-plugin from 3.1.1 to 3.1.2

15d594d

Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.1.1...maven-jar-plugin-3.1.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>


          Update pom.xml

a76db9e

Downgraded javadoc plugin due to issues with the Javadocs

ghost merged commit 092deed into master

GiantTreeLP mentioned this pull request

Add debug output #41

Closed

This pull request was closed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels