2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/entity/EntityExperienceOrb.java
|
|
|
|
+++ b/net/minecraft/world/entity/EntityExperienceOrb.java
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -21,6 +21,14 @@
|
2021-06-11 07:00:00 +02:00
|
|
|
import net.minecraft.world.phys.AxisAlignedBB;
|
2021-03-15 23:00:00 +01:00
|
|
|
import net.minecraft.world.phys.Vec3D;
|
2021-03-08 22:47:33 +01:00
|
|
|
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit start
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
2024-02-21 10:55:34 +01:00
|
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
2014-11-25 22:32:16 +01:00
|
|
|
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
|
|
|
|
+import org.bukkit.event.entity.EntityTargetEvent;
|
2023-04-21 10:46:56 +02:00
|
|
|
+import org.bukkit.event.player.PlayerExpCooldownChangeEvent;
|
2014-11-25 22:32:16 +01:00
|
|
|
+// CraftBukkit end
|
2021-03-08 22:47:33 +01:00
|
|
|
+
|
2019-04-23 04:00:00 +02:00
|
|
|
public class EntityExperienceOrb extends Entity {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
private static final int LIFETIME = 6000;
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -59,6 +67,7 @@
|
2019-04-23 04:00:00 +02:00
|
|
|
@Override
|
2018-07-15 02:00:00 +02:00
|
|
|
public void tick() {
|
|
|
|
super.tick();
|
2021-06-11 07:00:00 +02:00
|
|
|
+ EntityHuman prevTarget = this.followingPlayer;// CraftBukkit - store old target
|
2021-11-21 23:00:00 +01:00
|
|
|
this.xo = this.getX();
|
|
|
|
this.yo = this.getY();
|
|
|
|
this.zo = this.getZ();
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -84,7 +93,22 @@
|
2021-06-11 07:00:00 +02:00
|
|
|
this.followingPlayer = null;
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
- if (this.followingPlayer != null) {
|
2019-08-24 11:06:17 +02:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ boolean cancelled = false;
|
2021-06-11 07:00:00 +02:00
|
|
|
+ if (this.followingPlayer != prevTarget) {
|
|
|
|
+ EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this, followingPlayer, (followingPlayer != null) ? EntityTargetEvent.TargetReason.CLOSEST_PLAYER : EntityTargetEvent.TargetReason.FORGOT_TARGET);
|
2019-08-24 11:06:17 +02:00
|
|
|
+ EntityLiving target = (event.getTarget() == null) ? null : ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle();
|
|
|
|
+ cancelled = event.isCancelled();
|
|
|
|
+
|
|
|
|
+ if (cancelled) {
|
2021-06-11 07:00:00 +02:00
|
|
|
+ followingPlayer = prevTarget;
|
2019-08-24 11:06:17 +02:00
|
|
|
+ } else {
|
2021-06-11 07:00:00 +02:00
|
|
|
+ followingPlayer = (target instanceof EntityHuman) ? (EntityHuman) target : null;
|
2014-11-25 22:32:16 +01:00
|
|
|
+ }
|
2019-08-24 11:06:17 +02:00
|
|
|
+ }
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2021-06-11 07:00:00 +02:00
|
|
|
+ if (this.followingPlayer != null && !cancelled) {
|
2019-08-24 11:06:17 +02:00
|
|
|
+ // CraftBukkit end
|
2021-11-21 23:00:00 +01:00
|
|
|
Vec3D vec3d = new Vec3D(this.followingPlayer.getX() - this.getX(), this.followingPlayer.getY() + (double) this.followingPlayer.getEyeHeight() / 2.0D - this.getY(), this.followingPlayer.getZ() - this.getZ());
|
|
|
|
double d0 = vec3d.lengthSqr();
|
2019-04-23 04:00:00 +02:00
|
|
|
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -109,7 +133,7 @@
|
|
|
|
|
|
|
|
++this.age;
|
|
|
|
if (this.age >= 6000) {
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
@@ -178,7 +202,7 @@
|
|
|
|
private void merge(EntityExperienceOrb entityexperienceorb) {
|
|
|
|
this.count += entityexperienceorb.count;
|
|
|
|
this.age = Math.min(this.age, entityexperienceorb.age);
|
|
|
|
- entityexperienceorb.discard();
|
|
|
|
+ entityexperienceorb.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
|
|
|
|
private void setUnderwaterMovement() {
|
|
|
|
@@ -200,7 +224,7 @@
|
|
|
|
this.markHurt();
|
|
|
|
this.health = (int) ((float) this.health - f);
|
|
|
|
if (this.health <= 0) {
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.DEATH); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
@@ -227,17 +251,17 @@
|
2023-04-21 10:46:56 +02:00
|
|
|
public void playerTouch(EntityHuman entityhuman) {
|
2023-06-07 17:30:00 +02:00
|
|
|
if (!this.level().isClientSide) {
|
2023-04-21 10:46:56 +02:00
|
|
|
if (entityhuman.takeXpDelay == 0) {
|
|
|
|
- entityhuman.takeXpDelay = 2;
|
|
|
|
+ entityhuman.takeXpDelay = CraftEventFactory.callPlayerXpCooldownEvent(entityhuman, 2, PlayerExpCooldownChangeEvent.ChangeReason.PICKUP_ORB).getNewCooldown(); // CraftBukkit - entityhuman.takeXpDelay = 2;
|
|
|
|
entityhuman.take(this, 1);
|
2021-11-21 23:00:00 +01:00
|
|
|
int i = this.repairPlayerItems(entityhuman, this.value);
|
2017-11-21 00:17:31 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
if (i > 0) {
|
2021-11-21 23:00:00 +01:00
|
|
|
- entityhuman.giveExperiencePoints(i);
|
|
|
|
+ entityhuman.giveExperiencePoints(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, i).getAmount()); // CraftBukkit - this.value -> event.getAmount()
|
2018-07-15 02:00:00 +02:00
|
|
|
}
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
--this.count;
|
2024-02-21 10:55:34 +01:00
|
|
|
if (this.count == 0) {
|
|
|
|
- this.discard();
|
|
|
|
+ this.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -250,9 +274,17 @@
|
2021-06-11 07:00:00 +02:00
|
|
|
if (entry != null) {
|
|
|
|
ItemStack itemstack = (ItemStack) entry.getValue();
|
2023-12-05 17:40:00 +01:00
|
|
|
int j = Math.min(this.xpToDurability(i), itemstack.getDamageValue());
|
2021-06-11 07:00:00 +02:00
|
|
|
+ // CraftBukkit start
|
2022-10-02 00:07:14 +02:00
|
|
|
+ org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(entityhuman, this, itemstack, entry.getKey(), j);
|
2021-06-11 07:00:00 +02:00
|
|
|
+ j = event.getRepairAmount();
|
|
|
|
+ if (event.isCancelled()) {
|
|
|
|
+ return i;
|
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
2016-02-29 22:32:46 +01:00
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
itemstack.setDamageValue(itemstack.getDamageValue() - j);
|
|
|
|
int k = i - this.durabilityToXp(j);
|
2021-09-03 10:37:44 +02:00
|
|
|
+ this.value = k; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls
|
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
return k > 0 ? this.repairPlayerItems(entityhuman, k) : 0;
|
2021-09-03 10:37:44 +02:00
|
|
|
} else {
|
2024-02-21 10:55:34 +01:00
|
|
|
@@ -277,6 +309,24 @@
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
|
2021-11-21 23:00:00 +01:00
|
|
|
public static int getExperienceValue(int i) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ // CraftBukkit start
|
|
|
|
+ if (i > 162670129) return i - 100000;
|
|
|
|
+ if (i > 81335063) return 81335063;
|
|
|
|
+ if (i > 40667527) return 40667527;
|
|
|
|
+ if (i > 20333759) return 20333759;
|
|
|
|
+ if (i > 10166857) return 10166857;
|
|
|
|
+ if (i > 5083423) return 5083423;
|
|
|
|
+ if (i > 2541701) return 2541701;
|
|
|
|
+ if (i > 1270849) return 1270849;
|
|
|
|
+ if (i > 635413) return 635413;
|
|
|
|
+ if (i > 317701) return 317701;
|
|
|
|
+ if (i > 158849) return 158849;
|
|
|
|
+ if (i > 79423) return 79423;
|
|
|
|
+ if (i > 39709) return 39709;
|
|
|
|
+ if (i > 19853) return 19853;
|
|
|
|
+ if (i > 9923) return 9923;
|
|
|
|
+ if (i > 4957) return 4957;
|
|
|
|
+ // CraftBukkit end
|
|
|
|
return i >= 2477 ? 2477 : (i >= 1237 ? 1237 : (i >= 617 ? 617 : (i >= 307 ? 307 : (i >= 149 ? 149 : (i >= 73 ? 73 : (i >= 37 ? 37 : (i >= 17 ? 17 : (i >= 7 ? 7 : (i >= 3 ? 3 : 1)))))))));
|
|
|
|
}
|
|
|
|
|