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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index e92cb12a04827c2afc0662a26320458527aa2bd4..020b74065f7489a46b70ac52e5abbdb22132f8d8 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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -1834,7 +1834,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);
|
2024-01-13 16:35:59 +01:00
|
|
|
+ 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
|
|
|
}
|
2024-01-22 18:04:55 +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
|
2024-04-20 15:24:42 +02:00
|
|
|
index 482b6bd9277277923528d8c9a3e9b49d3f5628bc..25450884fa763b27ceaf16dd1bb3e80c10cb40c3 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-20 15:24:42 +02:00
|
|
|
@@ -1826,6 +1826,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) {
|