Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
2641c02193
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: 69fa4695 Add some missing deprecation annotations f850da2e Update Maven plugins/versions 8d8400db Use regular compiler seeing as ECJ doesn't support Java 21 JRE c29e1688 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 07bce714 SPIGOT-7355: More field renames and fixes 6a8ea764 Fix bad merge in penultimate commit 50a7920c Fix imports in previous commit 83640dd1 PR-995: Add required feature to MinecraftExperimental for easy lookups fc1f96cf BUILDTOOLS-676: Downgrade Maven compiler version CraftBukkit Changes: 90f1059ba Fix item placement 661afb43c SPIGOT-7633: Clearer error message for missing particle data 807b465b3 SPIGOT-7634: Armadillo updates infrequently 590cf09a8 Fix unit tests always seeing Mojang server as unavailable 7c7ac5eb2 SPIGOT-7636: Fix clearing ItemMeta 4a72905cf SPIGOT-7635: Fix Player#transfer and cookie methods ebb50e136 Fix incorrect Vault implementation b33fed8b7 Update Maven plugins/versions 6f00f0608 SPIGOT-7632: Control middle clicking chest does not copy contents db821f405 Use regular compiler seeing as ECJ doesn't support Java 21 JRE 8a2976737 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 0297f87bb SPIGOT-7355: More field renames and fixes 2d03bdf6a SPIGOT-7629: Fix loading banner patterns e77951fac Fix equality of deserialized display names c66f3e4fd SPIGOT-7631: Fix deserialisation of BlockStateMeta 9c2c7be8d SPIGOT-7630: Fix crash saving unticked leashed entities 8c1e7c841 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available ced93d572 SPIGOT-7626: sendSignChange() has no effect c77362cae SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5 ff2004387 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests 8b4abeb03 BUILDTOOLS-676: Downgrade Maven compiler version
74 Zeilen
3.9 KiB
Diff
74 Zeilen
3.9 KiB
Diff
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 230ffd3c4541ef8979605d733b6463e39cd00206..446556028028b25c35dbf3d099bf14a59e32a266 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
|
@@ -1855,7 +1855,7 @@ public abstract class Player extends LivingEntity {
|
|
}
|
|
|
|
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
|
|
}
|
|
// Paper start - send while respecting visibility
|
|
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 05b27413b50255b8862f8feab2cd60e260919971..84e7c91c56c306b6956520287364b87a297c14cf 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
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) {
|