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

Add dolphin spit

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-20 00:16:07 -05:00
parent 563f4c8b84
commit ff4ffaa066
32 changed files with 517 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 68290a5eb64583ce63b208aa47e55f044b6a2c00 Mon Sep 17 00:00:00 2001
From acca1c1f6497cee54cfe4ebc7b49781a4ae98751 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, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 76a925f7a..d64e02628 100644
index 0310e4ddd1..e85a7526a2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2645,9 +2645,16 @@ public abstract class EntityLiving extends Entity {
@@ -37,7 +37,7 @@ index 76a925f7a..d64e02628 100644
} else {
flag = false;
diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
index bd524a35b..c0e8cd0cd 100644
index bd524a35bb..c0e8cd0cdc 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 {
@@ -56,7 +56,7 @@ index bd524a35b..c0e8cd0cd 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 4fe503808..7b7a0a7cb 100644
index 4fe5038083..7b7a0a7cb1 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 {
@@ -82,7 +82,7 @@ index 4fe503808..7b7a0a7cb 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 f571a1586..c26300eac 100644
index f571a1586d..c26300eacd 100644
--- a/src/main/java/net/minecraft/server/ItemTrident.java
+++ b/src/main/java/net/minecraft/server/ItemTrident.java
@@ -100,6 +100,16 @@ public class ItemTrident extends Item {
@@ -103,10 +103,10 @@ index f571a1586..c26300eac 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 212af252b..fbc30e6ec 100644
index 62a0810062..53e7e82688 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -98,6 +98,7 @@ public class Vec3D implements IPosition {
@@ -100,6 +100,7 @@ public class Vec3D implements IPosition {
return (double) MathHelper.sqrt(this.x * this.x + this.y * this.y + this.z * this.z);
}
@@ -115,7 +115,7 @@ index 212af252b..fbc30e6ec 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 3a44e6e44..7cfc757db 100644
index 4615abfbee..e5de7cbe05 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -151,6 +151,19 @@ public class PurpurWorldConfig {