SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.21.4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-12-04 03:20:00 +11:00
parent 267ae64dd6
commit 5381ea78f7
125 changed files with 1383 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
+++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
@@ -12,6 +12,10 @@
@@ -10,6 +10,10 @@
import net.minecraft.world.level.World;
import net.minecraft.world.phys.MovingObjectPosition;
@@ -11,20 +11,20 @@
public class EntityThrownExpBottle extends EntityProjectileThrowable {
public EntityThrownExpBottle(EntityTypes<? extends EntityThrownExpBottle> entitytypes, World world) {
@@ -40,11 +44,20 @@
@@ -38,11 +42,20 @@
protected void onHit(MovingObjectPosition movingobjectposition) {
super.onHit(movingobjectposition);
if (this.level() instanceof WorldServer) {
- this.level().levelEvent(2002, this.blockPosition(), PotionContents.getColor(Potions.WATER));
- this.level().levelEvent(2002, this.blockPosition(), -13083194);
+ // CraftBukkit - moved to after event
+ // this.level().levelEvent(2002, this.blockPosition(), PotionContents.getColor(Potions.WATER));
+ // this.level().levelEvent(2002, this.blockPosition(), -13083194);
int i = 3 + this.level().random.nextInt(5) + this.level().random.nextInt(5);
+ // CraftBukkit start
+ org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, movingobjectposition, i);
+ i = event.getExperience();
+ if (event.getShowEffect()) {
+ this.level().levelEvent(2002, this.blockPosition(), PotionContents.getColor(Potions.WATER));
+ this.level().levelEvent(2002, this.blockPosition(), -13083194);
+ }
+ // CraftBukkit end
+