Compare commits

...

2 Commits

Author SHA1 Message Date
MrHua269
df05119601 Synced updates from branch dev/1.21.1 2024-08-12 11:02:18 +08:00
MrHua269
78fb25bac1 [ci skip]Correct CI name 2024-08-09 11:54:31 +08:00
3 changed files with 57 additions and 1 deletions

View File

@@ -1,4 +1,4 @@
name: Luminol CI - dev/1.21 name: Luminol CI - dev/1.21.1
on: on:
push: push:

View File

@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <wangxyper@163.com>
Date: Mon, 12 Aug 2024 10:37:33 +0800
Subject: [PATCH] Try fixing folia #273
diff --git a/src/main/java/org/bukkit/inventory/CraftingRecipe.java b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
index e8c3afda92d4ae5430d622ea18500985d6cc00f2..c78c1ee19a0960c6eca685a3b0d1ddbcb2831e94 100644
--- a/src/main/java/org/bukkit/inventory/CraftingRecipe.java
+++ b/src/main/java/org/bukkit/inventory/CraftingRecipe.java
@@ -102,7 +102,7 @@ public abstract class CraftingRecipe implements Recipe, Keyed {
@ApiStatus.Internal
@NotNull
protected static ItemStack checkResult(@NotNull ItemStack result) {
- Preconditions.checkArgument(result.isEmpty(), "Recipe cannot have an empty result"); // Paper
+ Preconditions.checkArgument(!result.isEmpty(), "Recipe cannot have an empty result"); // Paper
return result;
}
}

View File

@@ -0,0 +1,37 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <wangxyper@163.com>
Date: Mon, 12 Aug 2024 10:03:27 +0800
Subject: [PATCH] Try fixing memory leaking
Thanks to PedroMPagani(https://github.com/PedroMPagani) for finding what caused this leaking issue
diff --git a/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java b/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
index 5dc4c8a5b896f519be5414d4a53a71144c225324..7d4f66752c2f380f3c6c552d5bc7907b9ad69c6e 100644
--- a/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
+++ b/src/main/java/io/papermc/paper/threadedregions/RegionizedWorldData.java
@@ -549,7 +549,7 @@ public final class RegionizedWorldData {
public void addLoadedEntity(final Entity entity) {
if (this.loadedEntities.add(entity)) {
- this.toProcessTrackingUnloading.remove(entity);
+ //this.toProcessTrackingUnloading.remove(entity); // Luminol - Try fixing memory leaking
}
}
@@ -559,7 +559,7 @@ public final class RegionizedWorldData {
public void removeLoadedEntity(final Entity entity) {
if (this.loadedEntities.remove(entity)) {
- this.toProcessTrackingUnloading.add(entity);
+ //this.toProcessTrackingUnloading.add(entity); // Luminol - Try fixing memory leaking
}
}
@@ -567,6 +567,7 @@ public final class RegionizedWorldData {
return this.loadedEntities;
}
+ @java.lang.Deprecated // Luminol - Try fixing memory leaking
public Entity[] takeTrackingUnloads() {
final Entity[] ret = Arrays.copyOf(this.toProcessTrackingUnloading.getRawData(), this.toProcessTrackingUnloading.size(), Entity[].class);