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

Make bees ridable

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-21 00:46:32 -06:00
parent 92d6264962
commit 7525042e5b
8 changed files with 212 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0040-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 0887ffc6d8fb6ed2bd1488b5ca8b99d0f3d1139e Mon Sep 17 00:00:00 2001
From a4dcd36d98f5f3a00f5201b777478de3bdf990ab Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index de8e48b570..3d18c4eb60 100644
index 36d11cfdf..dee92e5a7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1508,6 +1508,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -32,7 +32,7 @@ index de8e48b570..3d18c4eb60 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index e6032e3edc..fc4e12d9af 100644
index e6032e3ed..fc4e12d9a 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -323,7 +323,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -45,10 +45,10 @@ index e6032e3edc..fc4e12d9af 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index f83e35f5ba..ad070687b5 100644
index b19028fa8..56bdaf0e0 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -54,7 +54,7 @@ public class EntityBat extends EntityAmbient {
@@ -55,7 +55,7 @@ public class EntityBat extends EntityAmbient {
}
@Override
@@ -58,7 +58,7 @@ index f83e35f5ba..ad070687b5 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 6a1d32df6e..03624bbd6a 100644
index 6a1d32df6..03624bbd6 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -71,7 +71,7 @@ index 6a1d32df6e..03624bbd6a 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 5cd46c7475..c02d2afbe0 100644
index 5cd46c747..c02d2afbe 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -84,7 +84,7 @@ index 5cd46c7475..c02d2afbe0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7a5a1a2d3e..7581316497 100644
index 7a5a1a2d3..758131649 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2673,7 +2673,7 @@ public abstract class EntityLiving extends Entity {
@@ -110,7 +110,7 @@ index 7a5a1a2d3e..7581316497 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 5abd8a1819..2aa8eb4071 100644
index 5abd8a181..2aa8eb407 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -106,7 +106,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -123,10 +123,10 @@ index 5abd8a1819..2aa8eb4071 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 04f0ef54b1..e21d075c61 100644
index 976b3c127..2aa12d83c 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -358,7 +358,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -359,7 +359,7 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
}
@Override
@@ -136,7 +136,7 @@ index 04f0ef54b1..e21d075c61 100644
}
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index a2d1ef3602..8d7273a38b 100644
index a2d1ef360..8d7273a38 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -33,11 +33,16 @@ public final class IEntitySelector {
@@ -158,7 +158,7 @@ index a2d1ef3602..8d7273a38b 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 1a49dd4d80..f7e1da705d 100644
index debf152bc..6c4fafaf7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -146,6 +146,11 @@ public class PurpurConfig {