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

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
Upstream has released updates that appears 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:
3dc4cdcd Update to Minecraft 1.14.3-pre4
88b25a8c SPIGOT-5098: Add a method to allow colored sign changes
6d913552 Update to Minecraft 1.14.3-pre4

CraftBukkit Changes:
f1f33559 Update to Minecraft 1.14.3
8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes
533290e2 SPIGOT-5100: Console warning from pig zombie targeting
6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants
9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working
38fa220f Fix setting game rules via the API
fe3930ce Update to Minecraft 1.14.3-pre4
da071ec5 Remove outdated build delay.

Spigot Changes:
4d2f30f1 Update to Minecraft 1.14.3
f16400e3 Update to Minecraft 1.14.3-pre4
This commit is contained in:
Shane Freeder
2019-06-25 02:47:58 +01:00
parent 651932f299
commit 40748b3c8d
166 changed files with 783 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Spigot-Server-Patches/Improve-death-events.patch
View File

@@ -27,7 +27,7 @@ index 84c3ea9d00..f563a7b630 100644
int i = this.f ? 300 : 100;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8a95e0f117..3a41137298 100644
index c32ed855bd..a92489e62a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 8a95e0f117..3a41137298 100644
protected void i(double d0, double d1, double d2) {
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 9157dace14..235ca47e16 100644
index 19eb40db93..ac56217227 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 9157dace14..235ca47e16 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 5184e52626..b363e9ce99 100644
index 301659d9bf..f9ba3b8561 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -0,0 +0,0 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 5184e52626..b363e9ce99 100644
public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 19e7114cbb..c357339c26 100644
index c80278ede0..86d3c516ba 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -123,10 +123,10 @@ index 19e7114cbb..c357339c26 100644
+ //SoundEffect soundeffect = this.getSoundDeath();
- if (flag1 && soundeffect != null) {
- this.a(soundeffect, this.getSoundVolume(), this.cU());
- this.a(soundeffect, this.getSoundVolume(), this.cV());
- }
+ //if (flag1 && soundeffect != null) {
+ // this.a(soundeffect, this.getSoundVolume(), this.cU());
+ // this.a(soundeffect, this.getSoundVolume(), this.cV());
+ //}
+ this.silentDeath = !flag1; // mark entity as dying silently
+ // Paper end
@@ -140,31 +140,16 @@ index 19e7114cbb..c357339c26 100644
Entity entity = damagesource.getEntity();
EntityLiving entityliving = this.getKillingEntity();
- if (this.aY >= 0 && entityliving != null) {
- entityliving.a(this, this.aY, damagesource);
- }
-
- if (entity != null) {
- entity.b(this);
- }
-
- if (this.isSleeping()) {
- this.dy();
- }
-
+ // Paper start - move down to make death event cancellable
+ //if (this.aY >= 0 && entityliving != null) {
+ // entityliving.a(this, this.aY, damagesource);
+ //}
+ //
+ //if (entity != null) {
+ // entity.b(this);
+ //}
+ //
+ //if (this.isSleeping()) {
+ // this.dy();
+ //}
+ //
+ /* // Paper - move down to make death event cancellable
if (this.aY >= 0 && entityliving != null) {
entityliving.a(this, this.aY, damagesource);
}
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.dz();
}
+ */ // Paper
this.killed = true;
- this.getCombatTracker().g();
+ //this.getCombatTracker().g();
@@ -179,7 +164,7 @@ index 19e7114cbb..c357339c26 100644
+ entity.onKill(this);
+ }
+ if (this.isSleeping()) {
+ this.dy();
+ this.dz();
+ }
+ this.getCombatTracker().reset();
+ } else {
@@ -196,18 +181,17 @@ index 19e7114cbb..c357339c26 100644
}
- protected void d(DamageSource damagesource) {
+ protected org.bukkit.event.entity.EntityDeathEvent processDeath(DamageSource damagesource) { return d(damagesource); }
+ protected org.bukkit.event.entity.EntityDeathEvent processDeath(DamageSource damagesource) { return d(damagesource); } // Paper - OBFHELPER
+ protected org.bukkit.event.entity.EntityDeathEvent d(DamageSource damagesource) { // Paper
Entity entity = damagesource.getEntity();
int i;
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
}
boolean flag = this.lastDamageByPlayerTime > 0;
-
+ org.bukkit.event.entity.EntityDeathEvent deathEvent = null; // Paper
if (this.isDropExperience() && this.world.getGameRules().getBoolean("doMobLoot")) {
if (this.isDropExperience() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
this.a(damagesource, flag);
this.dropDeathLoot(damagesource, i, flag);
// CraftBukkit start - Call death event
@@ -221,12 +205,12 @@ index 19e7114cbb..c357339c26 100644
// CraftBukkit end
}
- this.cE();
+ if (!deathEvent.isCancelled()) this.cE(); // Paper
- this.cF();
+ if (!deathEvent.isCancelled()) this.cF();; // Paper
+ return deathEvent; // Paper
}
protected void cE() {}
protected void cF() {}
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
return SoundEffects.ENTITY_GENERIC_HURT;
}
@@ -244,12 +228,12 @@ index 19e7114cbb..c357339c26 100644
return 1.0F;
}
+ public float getSoundPitch() { return cU();} // Paper - OBFHELPER
protected float cU() {
+ public float getSoundPitch() { return cV();} // Paper - OBFHELPER
protected float cV() {
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7519827a88..a0f27f1bcb 100644
index 2ce6063221..418a2cf0f4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -327,7 +311,7 @@ index 73cb64e09d..9f317ff2e8 100644
this.minecraftKey = minecraftKey;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7e2d4f4527..bd87a1cf2c 100644
index 672f92f85a..3dd0ae0ca8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {