From b62381a5f61b1bbed551108b75179c6edf7fde9f Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 7 Jun 2020 23:15:42 +0200 Subject: [PATCH 1/8] Add pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..e2437593f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,21 @@ + + + + +This pull request includes: + +- [ ] breaking changes +- [ ] no breaking changes + +### Changes made to the repository: + + + +### Documentation of test results: + + + + +### Related issues/discussions: + + From a79cc8041982e8142d0a229e2b2f8a1687e62390 Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 7 Jun 2020 23:16:57 +0200 Subject: [PATCH 2/8] Add bug report template --- .github/ISSUE_TEMPLATE/bug_report.md | 61 ++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..c46171383 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,61 @@ +--- +name: "\U0001F41E Bug report" +about: Create an issue which describes a bug in CloudNet +title: '' +labels: bug +assignees: '' + +--- + +**Description of the bug:** + + + + +**Steps to reproduce this bug:** + + + + + +**Expected behavior:** + + + + +**Screenshots:** + + + + +**Environment and used hardware:** + + + + +**Additional context (optional):** + + From d4b972492949fded37496206e24db17c0dba4f96 Mon Sep 17 00:00:00 2001 From: Marvin Date: Sun, 7 Jun 2020 23:18:11 +0200 Subject: [PATCH 3/8] Add template for feature requests --- .github/ISSUE_TEMPLATE/feature_request.md | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..069b1e36f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,38 @@ +--- +name: "\U0001F4A1 Feature request" +about: Create an issue describing a feature you want to see in CloudNet +title: '' +labels: enhancement +assignees: '' + +--- + +**Description of the new feature:** + + + +**Reasons for inclusion into the CloudNet code base:** + + + +**Planned audience:** + + + +**Preview of code and documentation:** + + + +**Additional context:** + + From 462cc5b6442facfe8e220c9a3be983e5b266aa20 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 29 Jun 2020 15:18:17 +0000 Subject: [PATCH 4/8] Create Dependabot config file --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..73acb8a86 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 99 + target-branch: development From 33add6501a014e840c0d35962003c90fea7e37ab Mon Sep 17 00:00:00 2001 From: Joschua Date: Tue, 30 Jun 2020 07:50:40 +0200 Subject: [PATCH 5/8] Added GitHub Actions check for dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 73acb8a86..131976aa3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,3 +6,9 @@ updates: interval: daily open-pull-requests-limit: 99 target-branch: development + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 99 + target-branch: development From 13c7074e9a0e80081ec1afc5890b9cb6e75fbb47 Mon Sep 17 00:00:00 2001 From: Joschua Date: Tue, 30 Jun 2020 07:51:33 +0200 Subject: [PATCH 6/8] Fixed incorrect formatting --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 131976aa3..02952597d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,7 +6,7 @@ updates: interval: daily open-pull-requests-limit: 99 target-branch: development - - package-ecosystem: github-actions +- package-ecosystem: github-actions directory: "/" schedule: interval: daily From 8b61d179086fc7ae73f5f0fe6ad353d722864e35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 19:10:59 +0000 Subject: [PATCH 7/8] Bump log4j-core in /cloudnet-api/cloudnet-api-bridge Bumps log4j-core from 2.12.1 to 2.13.2. Signed-off-by: dependabot[bot] --- cloudnet-api/cloudnet-api-bridge/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudnet-api/cloudnet-api-bridge/pom.xml b/cloudnet-api/cloudnet-api-bridge/pom.xml index 6be382390..2355a9a7a 100644 --- a/cloudnet-api/cloudnet-api-bridge/pom.xml +++ b/cloudnet-api/cloudnet-api-bridge/pom.xml @@ -36,7 +36,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 provided From 17f05eaff413db29c08e072388125fa79a03aa43 Mon Sep 17 00:00:00 2001 From: TaskID <58621956+TaskID@users.noreply.github.com> Date: Sat, 12 Dec 2020 23:52:23 +0100 Subject: [PATCH 8/8] Added Line 90 Added the line 90 null check to fix a NullPointerException when a player is disconnecting. --- .../dytanic/cloudnet/bridge/internal/util/CloudPermissible.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java b/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java index 4ca97e86f..7c8eeda51 100644 --- a/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java +++ b/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java @@ -87,6 +87,7 @@ public void recalculatePermissions() { return; } + if(!CloudServer.getInstance().getCloudPlayers().containsKey(this.uniqueId)) return; PermissionEntity permissionEntity = CloudServer.getInstance().getCloudPlayers().get(this.uniqueId).getPermissionEntity(); final Map playerPermissions = permissionEntity.getPermissions(); playerPermissions.forEach((key, value) -> {