Paper/patches/server/0937-Add-experience-points-API.patch

74 lines
3.9 KiB
Diff
Raw Normal View History

2023-12-28 00:49:45 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lukas Planz <lukas.planz@web.de>
Date: Tue, 5 Sep 2023 20:34:20 +0200
Subject: [PATCH] Add experience points API
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 83a205387cb902121aabf0f5082c650debcb734c..dad2b84a2220368f2da005e217d73c63bb540a08 100644
2023-12-28 00:49:45 +01:00
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
2024-04-25 01:25:57 +02:00
@@ -1855,7 +1855,7 @@ public abstract class Player extends LivingEntity {
2023-12-28 00:49:45 +01:00
}
public int getXpNeededForNextLevel() {
- return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2);
+ return this.experienceLevel >= 30 ? 112 + (this.experienceLevel - 30) * 9 : (this.experienceLevel >= 15 ? 37 + (this.experienceLevel - 15) * 5 : 7 + this.experienceLevel * 2); // Paper - diff on change; calculateTotalExperiencePoints
2023-12-28 00:49:45 +01:00
}
// Paper start - send while respecting visibility
2023-12-28 00:49:45 +01:00
private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7fca299a92d330a46336c9fc88156d2ff18f3903..8016976d226a421b3e16d281fa3c01be2f8d3eb0 100644
2023-12-28 00:49:45 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2024-04-25 01:25:57 +02:00
@@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2023-12-28 00:49:45 +01:00
Preconditions.checkArgument(exp >= 0, "Total experience points must not be negative (%s)", exp);
this.getHandle().totalExperience = exp;
}
+ // Paper start
+ @Override
+ public int calculateTotalExperiencePoints() {
+ return calculateTotalExperiencePoints(this.getLevel()) + Math.round(this.getExperiencePointsNeededForNextLevel() * getExp());
+ }
+
+ @Override
+ public void setExperienceLevelAndProgress(final int totalExperience) {
+ Preconditions.checkArgument(totalExperience >= 0, "Total experience points must not be negative (%s)", totalExperience);
+ int level = calculateLevelsForExperiencePoints(totalExperience);
+ int remainingPoints = totalExperience - calculateTotalExperiencePoints(level);
+
+ this.getHandle().experienceLevel = level;
+ this.getHandle().experienceProgress = (float) remainingPoints / this.getExperiencePointsNeededForNextLevel();
+ this.getHandle().lastSentExp = -1;
+ }
+
+ @Override
+ public int getExperiencePointsNeededForNextLevel() {
+ return this.getHandle().getXpNeededForNextLevel();
+ }
+
+ // See https://minecraft.wiki/w/Experience#Leveling_up for reference
+ private int calculateTotalExperiencePoints(int level) {
+ if (level <= 16) {
+ return (int) (Math.pow(level, 2) + 6 * level);
+ } else if (level <= 31) {
+ return (int) (2.5 * Math.pow(level, 2) - 40.5 * level + 360.0);
+ } else {
+ return (int) (4.5 * Math.pow(level, 2) - 162.5 * level + 2220.0);
+ }
+ }
+
+ private int calculateLevelsForExperiencePoints(int points) {
+ if (points <= 352) { // Level 0-16
+ return (int) Math.floor(Math.sqrt(points + 9) - 3);
+ } else if (points <= 1507) { // Level 17-31
+ return (int) Math.floor(8.1 + Math.sqrt(0.4 * (points - (7839.0 / 40.0))));
+ } else { // 32+
+ return (int) Math.floor((325.0 / 18.0) + Math.sqrt((2.0 / 9.0) * (points - (54215.0 / 72.0))));
+ }
+ }
+ // Paper end
@Override
public void sendExperienceChange(float progress) {