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

Fix #1215

Browse Source
This commit is contained in:
BillyGalbreath
2022-12-14 12:15:42 -06:00
parent cceae2cdb3
commit db7d41a7dd
4 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0006-Ridables.patch
View File

@@ -173,26 +173,6 @@ index efce81deda7403d056628ab1a83f909af548b424..3f2813e32a1ea011f760d2df454b8875
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index e5cd4b7609243669c9d84ff8a4988c209e6101aa..b5924bb104519f93328983f023b8e573e2a155ff 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -301,6 +301,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
private ResourceLocation lootTable;
private final EntityDimensions dimensions;
private final FeatureFlagSet requiredFeatures;
+ public final String id; // Purpur
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
@@ -336,6 +337,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
this.clientTrackingRange = maxTrackDistance;
this.updateInterval = trackTickInterval;
this.requiredFeatures = requiredFeatures;
+ this.id = id; // Purpur
}
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..882ab40c8cdea8c214cb8344b3ccecddb2967c1c 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -300,7 +280,7 @@ index 9e075de3542bda8ae086c9ca68bcd00b16d565d0..1e75f62ff6bd83f6007090dde5ce521f
// Paper end
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 49b983064ea810382b6112f5dc7f93ba4e5710bd..35e02891f21c661808fea7d59c6c312f2193a6d3 100644
index 49b983064ea810382b6112f5dc7f93ba4e5710bd..cb7f66bab7c08b6485576878bf330be9ffa329b8 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,8 +146,8 @@ public abstract class Mob extends LivingEntity {
@@ -362,7 +342,7 @@ index 49b983064ea810382b6112f5dc7f93ba4e5710bd..35e02891f21c661808fea7d59c6c312f
+ return InteractionResult.PASS;
+ }
+ }
+ if (!player.getBukkitEntity().hasPermission("allow.ride." + getType().id)) {
+ if (!player.getBukkitEntity().hasPermission("allow.ride." + net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.getKey(getType()).getPath())) {
+ player.sendMiniMessage(org.purpurmc.purpur.PurpurConfig.cannotRideMob);
+ return InteractionResult.PASS;
+ }

6
patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index e368ebc593653b10f79a06811f28f8cbcb953c18..2aff49c24bbe2fbdebd70327af34b2dc2f5f83e6 100644
index e5cd4b7609243669c9d84ff8a4988c209e6101aa..d4c75ccc3514c41f6d6fecf8555c34c89385b379 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -307,6 +307,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -306,6 +306,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
return (EntityType) Registry.register(BuiltInRegistries.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
}
@@ -25,7 +25,7 @@ index e368ebc593653b10f79a06811f28f8cbcb953c18..2aff49c24bbe2fbdebd70327af34b2dc
public static ResourceLocation getKey(EntityType<?> type) {
return BuiltInRegistries.ENTITY_TYPE.getKey(type);
}
@@ -515,6 +525,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -513,6 +523,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
return this.category;
}

6
patches/server/0085-Short-enderman-height.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Short enderman height
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 2aff49c24bbe2fbdebd70327af34b2dc2f5f83e6..30cfdacc049e9397fad759b26adc3c711d16c9bb 100644
index d4c75ccc3514c41f6d6fecf8555c34c89385b379..94f72cf064e408c80b0f6ec644c9f69e66f94f36 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -299,7 +299,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -16,8 +16,8 @@ index 2aff49c24bbe2fbdebd70327af34b2dc2f5f83e6..30cfdacc049e9397fad759b26adc3c71
+ private EntityDimensions dimensions; // Purpur - remove final
+ public void setDimensions(EntityDimensions dimensions) { this.dimensions = dimensions; } // Purpur
private final FeatureFlagSet requiredFeatures;
public final String id; // Purpur
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index c3bda3227736c5f8529b6ecbd0f17076f2d470e8..f130f3f8ceb5ab30e0b53e8b78281bfb953af5a9 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -31,7 +31,7 @@ index c3bda3227736c5f8529b6ecbd0f17076f2d470e8..f130f3f8ceb5ab30e0b53e8b78281bfb
Entity entity = source.getDirectEntity();
boolean flag;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 980aaf2a78d3f412767bc9138a668d52bd5e874d..6be967a235249175b18d5828f6d3634b9a4f0ed1 100644
index d646e0f7661436814ea59ab6054094f454d97aa4..453557507925a3eaa2d6057e2f776a25ebbae18a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -242,6 +242,12 @@ public class PurpurConfig {

4
patches/server/0306-Log-skipped-entity-s-position.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Log skipped entity's position
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 30cfdacc049e9397fad759b26adc3c711d16c9bb..9f38eff49565faedb1a442d5b4fe8d01be9b9426 100644
index 94f72cf064e408c80b0f6ec644c9f69e66f94f36..14ba4c3befd36c2f2d5e9a1b1de3d933e5e0f39f 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -597,6 +597,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -595,6 +595,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
entity.load(nbt);
}, () -> {
EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id"));