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

Update Paper to 1.13 proper - THIS IS STILL HIGHLY UNSTABLE

Browse Source 
DO NOT RUN ON PRODUCTION SERVERS!!! Use Backups!!
This commit is contained in:
Aikar
2018-07-22 01:27:46 -04:00
parent 6b5f080374
commit 70c967fb6b
77 changed files with 254 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/EndermanEscapeEvent.patch
View File

@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
You may cancel this, enabling ranged attacks to damage the enderman for example.
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index 96e29539b..e5eb0189d 100644
index ddf64ee6c..a766b3895 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -0,0 +0,0 @@
@@ -39,7 +39,7 @@ index 96e29539b..e5eb0189d 100644
- if (f > 0.5F && this.world.e(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
+ if (f > 0.5F && this.world.e(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
this.setGoalTarget((EntityLiving) null);
this.dz();
this.dA();
}
@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
public boolean damageEntity(DamageSource damagesource, float f) {
@@ -48,7 +48,7 @@ index 96e29539b..e5eb0189d 100644
- } else if (damagesource instanceof EntityDamageSourceIndirect) {
+ } else if (damagesource instanceof EntityDamageSourceIndirect && tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper
for (int i = 0; i < 64; ++i) {
if (this.dz()) {
if (this.dA()) {
return true;
@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
} else {
@@ -56,7 +56,7 @@ index 96e29539b..e5eb0189d 100644
- if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0) {
+ if (damagesource.ignoresArmor() && this.random.nextInt(10) != 0 && tryEscape(damagesource == DamageSource.DROWN ? EndermanEscapeEvent.Reason.DROWN : EndermanEscapeEvent.Reason.CRITICAL_HIT)) { // Paper
this.dz();
this.dA();
}
@@ -0,0 +0,0 @@ public class EntityEnderman extends EntityMonster {
@@ -74,7 +74,7 @@ index 96e29539b..e5eb0189d 100644
if (this.i.f((EntityHuman) this.d)) {
- if (((EntityHuman) this.d).h(this.i) < 16.0D) {
+ if (((EntityHuman) this.d).h(this.i) < 16.0D && this.getEnderman().tryEscape(EndermanEscapeEvent.Reason.STARE)) { // Paper
this.i.dz();
this.i.dA();
}
--