Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorder patches

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-09 14:58:38 -05:00
parent aa757e4d39
commit 58db6dc333
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/server/0009-Silk-touch-spawners.patch → patches/server/0008-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From 5106aa0fddffb484b3a0a97d3fff0761814e81b2 Mon Sep 17 00:00:00 2001 From 2f26b5ae47d6b6528c3955c8244da07a298deded Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500 Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners Subject: [PATCH] Silk touch spawners

6
patches/server/0008-Integrate-ridables.patch → patches/server/0009-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 2de5e5fb595c7060de3ebe191e00acc78449b8c2 Mon Sep 17 00:00:00 2001 From ef2801006bcaeab3d67c10a64461823cfce892e4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -126,7 +126,7 @@ index 454627f65..df3d6cf28 100644
this.d = false; this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7bdc0f4a5..af7a4f89b 100644 index 9834a8928..1b38ac55c 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -101,6 +101,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -101,6 +101,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1058,7 +1058,7 @@ index 7aebc90af..97a5dcfd0 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 488ecbaa9..4a1fefbb4 100644 index b27a9efcc..40264185a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -88,9 +88,9 @@ public abstract class EntityLiving extends Entity { @@ -88,9 +88,9 @@ public abstract class EntityLiving extends Entity {