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

Update to Minecraft 1.18-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,22 +1,22 @@
--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
+++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
@@ -39,9 +39,18 @@
protected void a(MovingObjectPosition movingobjectposition) {
super.a(movingobjectposition);
protected void onHit(MovingObjectPosition movingobjectposition) {
super.onHit(movingobjectposition);
if (this.level instanceof WorldServer) {
- this.level.triggerEffect(2002, this.getChunkCoordinates(), PotionUtil.a(Potions.WATER));
- this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
+ // CraftBukkit - moved to after event
+ // this.level.triggerEffect(2002, this.getChunkCoordinates(), PotionUtil.a(Potions.WATER));
+ // this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
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, i);
+ i = event.getExperience();
+ if (event.getShowEffect()) {
+ this.level.triggerEffect(2002, this.getChunkCoordinates(), PotionUtil.a(Potions.WATER));
+ this.level.levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
+ }
+ // CraftBukkit end
+
EntityExperienceOrb.a((WorldServer) this.level, this.getPositionVector(), i);
this.die();
EntityExperienceOrb.award((WorldServer) this.level, this.position(), i);
this.discard();
}