Skip to content

Commit

Permalink
[ci-skip] Forgot the comment!
Browse files Browse the repository at this point in the history
I am deeply sorry for my actions. I encountered a lapse of judgement and am attempting to better my mistakes.
  • Loading branch information
encode42 committed Jul 20, 2021
1 parent 246383a commit 704388e
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ Subject: [PATCH] Config to disable Enderman teleport on projectile hit


diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index ba61f78874d8578b862f317fe00a3162c45253e0..00eb217aac728a6dde32837bb02f34e4ff0d85c0 100644
index ba61f78874d8578b862f317fe00a3162c45253e0..42370072dac9144be5c07f88d24d8ba4705d68dd 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -394,7 +394,7 @@ public class EnderMan extends Monster implements NeutralMob {
return false;
} else if (getRider() != null) { return super.hurt(source, amount); // Purpur - no teleporting on damage
} else if (net.pl3x.purpur.PurpurConfig.endermanShortHeight && source == DamageSource.IN_WALL) { return false; // Purpur - no suffocation damage if short height
- } else if (source instanceof IndirectEntityDamageSource) {
+ } else if (source instanceof IndirectEntityDamageSource && !(this.level.purpurConfig.endermanIgnoreProjectiles && source.getDirectEntity() instanceof net.minecraft.world.entity.projectile.Projectile)) {
+ } else if (source instanceof IndirectEntityDamageSource && !(this.level.purpurConfig.endermanIgnoreProjectiles && source.getDirectEntity() instanceof net.minecraft.world.entity.projectile.Projectile)) { // Purpur
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
Expand Down

4 comments on commit 704388e

@MomoMiles
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason for CI-Skip on this? Is this not intended for general use?

@granny
Copy link
Member

@granny granny commented on 704388e Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the addition was just a comment, so it has no reason having a whole build being built just for a piece of text that doesn't change anything internally

@MomoMiles
Copy link

@MomoMiles MomoMiles commented on 704388e Jul 20, 2021 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@granny
Copy link
Member

@granny granny commented on 704388e Jul 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that's a bug with jenkins :P [ci-skip] commits shouldn't build at all but it still showed up on the downloads page.. Will be fixed eventually

Please sign in to comment.