twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 05:30:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

Configurable xp orb merge group count (#12503)

Browse Source
This commit is contained in:
Mart 2025-05-03 18:51:19 +00:00 committed by GitHub
parent 6f1f5b67e0
commit 88a3a87015
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/patches/sources/net/minecraft/world/entity/ExperienceOrb.java.patch
View File

@ -97,7 +97,7 @@
Vec3 vec3 = new Vec3(
this.followingPlayer.getX() - this.getX(),
this.followingPlayer.getY() + this.followingPlayer.getEyeHeight() / 2.0 - this.getY(),
@@ -161,16 +_,27 @@
@@ -161,18 +_,29 @@
}
public static void award(ServerLevel level, Vec3 pos, int amount) {
@ -124,9 +124,17 @@
private static boolean tryMergeToExisting(ServerLevel level, Vec3 pos, int amount) {
+ // Paper - TODO some other event for this kind of merge
AABB aabb = AABB.ofSize(pos, 1.0, 1.0, 1.0);
int randomInt = level.getRandom().nextInt(40);
- int randomInt = level.getRandom().nextInt(40);
+ int randomInt = level.getRandom().nextInt(io.papermc.paper.configuration.GlobalConfiguration.get().misc.xpOrbGroupsPerArea.or(ORB_GROUPS_PER_AREA)); // Paper - Configure how many orb groups per area
List<ExperienceOrb> entities = level.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), aabb, orb -> canMerge(orb, randomInt, amount));
@@ -193,9 +_,14 @@
if (!entities.isEmpty()) {
ExperienceOrb experienceOrb = entities.get(0);
@@ -189,13 +_,18 @@
}
private static boolean canMerge(ExperienceOrb orb, int amount, int other) {
- return !orb.isRemoved() && (orb.getId() - amount) % 40 == 0 && orb.getValue() == other;
+ return !orb.isRemoved() && (orb.getId() - amount) % io.papermc.paper.configuration.GlobalConfiguration.get().misc.xpOrbGroupsPerArea.or(ORB_GROUPS_PER_AREA) == 0 && orb.getValue() == other; // Paper - Configure how many orbs will merge together
}
private void merge(ExperienceOrb orb) {

3
paper-server/src/main/java/io/papermc/paper/configuration/Configurations.java
View File

@ -62,7 +62,8 @@ public abstract class Configurations<G, W> {
protected ObjectMapper.Factory.Builder createObjectMapper() {
return ObjectMapper.factoryBuilder()
.addConstraint(Constraint.class, new Constraint.Factory())
.addConstraint(Constraints.Min.class, Number.class, new Constraints.Min.Factory());
.addConstraint(Constraints.Min.class, Number.class, new Constraints.Min.Factory())
.addConstraint(Constraints.Max.class, Number.class, new Constraints.Max.Factory());
}
protected YamlConfigurationLoader.Builder createLoaderBuilder() {

3
paper-server/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
View File

@ -356,6 +356,9 @@ public class GlobalConfiguration extends ConfigurationPart {
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
@Comment("Defines the leniency distance added on the server to the interaction range of a player when validating interact packets.")
public DoubleOr.Default clientInteractionLeniencyDistance = DoubleOr.Default.USE_DEFAULT;
@Comment("Defines how many orbs groups can exist in an area.")
@Constraints.Min(1)
public IntOr.Default xpOrbGroupsPerArea = IntOr.Default.USE_DEFAULT;
}
public BlockUpdates blockUpdates;

18
paper-server/src/main/java/io/papermc/paper/configuration/constraint/Constraints.java
View File

@ -40,4 +40,22 @@ public final class Constraints {
}
}
}
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface Max {
int value();
final class Factory implements Constraint.Factory<Max, Number> {
@Override
public Constraint<Number> make(Max data, Type type) {
return value -> {
if (value != null && value.intValue() > data.value()) {
throw new SerializationException(value + " is greater than the max " + data.value());
}
};
}
}
}
}