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

Fix issues with minecarts not being collidable

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-01 12:15:25 -05:00
parent 60b855c374
commit 176ef08145
2 changed files with 69 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From a4d91783ad3be818efecbd73661bc4d89df2ab17 Mon Sep 17 00:00:00 2001
From e6a9f0d798945c4028a397440f68dadd2c62a28d 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 4e6598cf5..cbd7ab3a8 100644
index 84aebb91..1ad2176e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2588,9 +2588,16 @@ public abstract class EntityLiving extends Entity {
@@ -36,7 +36,7 @@ index 4e6598cf5..cbd7ab3a8 100644
}
} else {
flag = false;
@@ -3237,6 +3244,7 @@ public abstract class EntityLiving extends Entity {
@@ -3232,6 +3239,7 @@ public abstract class EntityLiving extends Entity {
}
}
@@ -45,7 +45,7 @@ index 4e6598cf5..cbd7ab3a8 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 9e86ef4ce..832cea636 100644
index 9e86ef4c..832cea63 100644
--- a/src/main/java/net/minecraft/server/ItemFireworks.java
+++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -38,6 +38,14 @@ public class ItemFireworks extends Item {
@@ -64,7 +64,7 @@ index 9e86ef4ce..832cea636 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 0e164840f..d9b63547d 100644
index 0e164840..d9b63547 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -393,7 +393,7 @@ public final class ItemStack {
@@ -90,7 +90,7 @@ index 0e164840f..d9b63547d 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 c40815736..28f9f6e40 100644
index c4081573..28f9f6e4 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 {
@@ -111,7 +111,7 @@ index c40815736..28f9f6e40 100644
entityhuman.q(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 d2eb861af..b89f9fe7b 100644
index d2eb861a..b89f9fe7 100644
--- a/src/main/java/net/minecraft/server/Vec3D.java
+++ b/src/main/java/net/minecraft/server/Vec3D.java
@@ -93,6 +93,7 @@ public class Vec3D implements IPosition {
@@ -123,7 +123,7 @@ index d2eb861af..b89f9fe7b 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 489083928..b235c8769 100644
index 48908392..b235c876 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,4 +128,17 @@ public class PurpurWorldConfig {