[ci skip] more cleanup from repo reorg

notTamion · Dec 23, 2024 · eb793c3 · eb793c3
1 parent 083c083
commit eb793c3
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 171 deletions.
diff --git a/paper-api/.gitignore b/paper-api/.gitignore
diff --git a/paper-server/.gitignore b/paper-server/.gitignore
diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts
@@ -313,7 +313,6 @@ tasks.registerRunTask("runReobfServer") {
 tasks.registerRunTask("runDevServer") {
     description = "Spin up a test server without assembling a jar"
     classpath(sourceSets.main.map { it.runtimeClasspath })
-    jvmArgs("-DPaper.pushPaperAssetsRoot=true")
 }
 
 tasks.registerRunTask("runBundler") {

diff --git a/...-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch b/...-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch
diff --git a/paper-server/src/assembly/META-INF/main-class b/paper-server/src/assembly/META-INF/main-class
diff --git a/paper-server/src/assembly/bootstrap.xml b/paper-server/src/assembly/bootstrap.xml
diff --git a/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java b/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java
@@ -75,7 +75,6 @@ public static RegistryAccess.Frozen createRegistry(FeatureFlagSet featureFlagSet
     }
 
     public static void setup(FeatureFlagSet featureFlagSet) {
-        System.setProperty("Paper.pushPaperAssetsRoot", "true"); // Paper - build system changes - push asset root
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();