Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
33a615de Add option to nerf pigmen from nether portals (#2937)
125a517d Update upstream CB
This commit is contained in:
William Blake Galbreath
2020-02-18 20:13:10 -06:00
parent 9e073631de
commit c98e91e6e3
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0003-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 3474d5f429c81085846778662112ce25f0824d74 Mon Sep 17 00:00:00 2001
From 0726d8c0f7c9b3e40fe342597c09c6d6f3e9c14d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -142,7 +142,7 @@ index a5c4cbb67..efe6afde9 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index acb7848d8..37c1c519b 100644
index a855d743a..c60d13b89 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -172,7 +172,7 @@ index acb7848d8..37c1c519b 100644
public boolean noclip;
public float J;
protected final Random random;
@@ -2108,7 +2108,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2115,7 +2115,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -187,7 +187,7 @@ index acb7848d8..37c1c519b 100644
}
return true; // CraftBukkit
}
@@ -2143,6 +2149,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2150,6 +2156,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -200,7 +200,7 @@ index acb7848d8..37c1c519b 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2529,6 +2541,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2536,6 +2548,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -208,7 +208,7 @@ index acb7848d8..37c1c519b 100644
public void l(float f) {}
public boolean bA() {
@@ -3374,4 +3387,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3381,4 +3394,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -1976,7 +1976,7 @@ index 81b7cd06f..3e6722cfc 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index e54f1e840..b25ebcfd9 100644
index 2cee73ace..f0ef48bb1 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {