From 850a1e1949f6f0bec3faef3dbfc23fc1b31cde75 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Mon, 14 Jun 2021 23:51:30 -0700
Subject: [PATCH] Updated Upstream (CraftBukkit)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
f992ce60 Fix duplicate datapack reload on /reload
---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 2 ++
 work/CraftBukkit    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8da4bfb38b..0704b95179 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.core") version "1.0.1"
+    id("io.papermc.paperweight.core") version "1.0.1-LOCAL-SNAPSHOT"
 }
 
 subprojects {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4127fc6b8c..27f9364149 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,11 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
         maven("https://papermc.io/repo/repository/maven-public/")
     }
 }
+includeBuild("../paperweight")
 
 rootProject.name = "Paper"
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 622cf61119..f992ce6097 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 622cf6111905e787add191b9a88d62656439ef31
+Subproject commit f992ce6097f846ed5967fc797d98ae3e84ef1b10