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

Update to 1.15.1

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-17 19:41:51 -06:00
parent 3984c3706f
commit bdb7592c66
9 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0045-Implement-elytra-settings.patch
View File

@@ -1,4 +1,4 @@
From eba616d0174d1b56458799b7944350a89fffc7d4 Mon Sep 17 00:00:00 2001
From 24079d34d7c2c8ed404993c937c873cff1b2e606 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 25 Jul 2019 18:07:37 -0500
Subject: [PATCH] Implement elytra settings
@@ -13,7 +13,7 @@ Subject: [PATCH] Implement elytra settings
6 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7581316497..7d424040cc 100644
index 758131649..7d424040c 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2652,9 +2652,16 @@ public abstract class EntityLiving extends Entity {
@@ -45,7 +45,7 @@ index 7581316497..7d424040cc 100644
this.world.broadcastEntityEffect(this, d(enumitemslot));
}
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index a43e52889f..cc8fbccd16 100644
index a43e52889..cc8fbccd1 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -39,6 +39,14 @@ public class ItemFireworks extends Item {
@@ -64,7 +64,7 @@ index a43e52889f..cc8fbccd16 100644
itemstack.subtract(1);
} else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 222a8fdc3b..5379d0e0d8 100644
index d09f0b3f7..eafce44b3 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -401,7 +401,7 @@ public final class ItemStack {
@@ -90,10 +90,10 @@ index 222a8fdc3b..5379d0e0d8 100644
if (this.count == 1 && t0 instanceof EntityHuman) {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this);
diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java
index b8c36e9b10..cff48fafa0 100644
index 1cbaed9da..b7610aaf7 100644
--- a/src/main/java/net/minecraft/server/ItemTrident.java
+++ b/src/main/java/net/minecraft/server/ItemTrident.java
@@ -93,6 +93,16 @@ public class ItemTrident extends Item {
@@ -100,6 +100,16 @@ public class ItemTrident extends Item {
f2 *= f6 / f5;
f3 *= f6 / f5;
f4 *= f6 / f5;
@@ -111,7 +111,7 @@ index b8c36e9b10..cff48fafa0 100644
entityhuman.r(20);
if (entityhuman.onGround) {
diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
index 0c7f094e54..dfa2a863a0 100644
index 0c7f094e5..dfa2a863a 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -97,6 +97,7 @@ public class Vec3D implements IPosition {
@@ -123,7 +123,7 @@ index 0c7f094e54..dfa2a863a0 100644
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8d01cdc8e3..059cf85f4f 100644
index 8d01cdc8e..059cf85f4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -130,4 +130,17 @@ public class PurpurWorldConfig {