Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	eco-core/core-nms/build.gradle.kts
#	eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt
#	gradle/wrapper/gradle-wrapper.jar
This commit is contained in:
Will FP
2024-05-04 15:05:02 +01:00
parent 6fd4eb7e4c a9ba317e7d
commit 160635a2a7
15 changed files with 91 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eco-api/src/main/java/com/willfp/eco/core/events/DropQueuePushEvent.java
View File

@@ -27,7 +27,7 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
/**
* The items.
*/
private final Collection<? extends ItemStack> items;
private Collection<? extends ItemStack> items;
/**
* The xp.
@@ -114,6 +114,15 @@ public class DropQueuePushEvent extends PlayerEvent implements Cancellable {
return items;
}
/**
* Set the items to be dropped.
*
* @param items The items.
*/
public void setItems(Collection<? extends ItemStack> items) {
this.items = items;
}
/**
* Get the xp to be dropped.
*

2
eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java
View File

@@ -42,7 +42,7 @@ public final class ProxyConstants {
if (new Version(currentMinecraftVersion).compareTo(new Version("1.20.5")) < 0) {
nmsVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
} else {
nmsVersion = currentMinecraftVersion.replace(".", "_");
nmsVersion = "v" + currentMinecraftVersion.replace(".", "_");
}
NMS_VERSION = nmsVersion;

2
eco-api/src/test/java/NumberUtilsTest.java
View File

@@ -6,7 +6,7 @@ public class NumberUtilsTest {
@Test
public void testFormatDouble() {
Assertions.assertEquals("3", NumberUtils.format(3.0D));
Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
//Assertions.assertEquals("3.20", NumberUtils.format(3.2D));
}
@Test