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

progress

Browse Source
This commit is contained in:
BillyGalbreath
2021-06-19 18:39:19 -05:00
parent fe831e6e7f
commit feb0570a5a
58 changed files with 222 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0003-Ridables.patch
View File

@@ -34,7 +34,7 @@ index 736a7baab17b26319f2aa39ad059e2f5a7ee16cf..ae939c81523a3982fc91fe4793ed0553
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ef651213d29a8c9b60e39b98ad52f5b7b54f3c22..ce49e2a5ac80280ae03579d72a436e836a03cf8e 100644
index b3312fa2fd218ffcfaa61d98584003c97fbda4ce..f0b9ff60b6122473bc2f87f56a6d190994079da6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -201,6 +201,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
@@ -86,7 +86,7 @@ index 7d2ac8aa97805e8b022d3982b1332c5055fc8b90..b98263dc5dcba1a5a8518c2f0acd2c9d
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index af90013d48e2dd827e045e2fc0f7f5be0dbaa33f..37ded5b8fb3692c773698a794d3977808308801d 100644
index a10df746ada5b8cdee6f5ccf90724142609841c6..d59ec735b15b02c075f357ee616b821d2760f412 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -135,37 +135,7 @@ index af90013d48e2dd827e045e2fc0f7f5be0dbaa33f..37ded5b8fb3692c773698a794d397780
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -3371,6 +3385,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return SlotAccess.NULL;
}
+ // Purpur Start
+ public void sendMessage(@Nullable String message) {
+ if (message == null) {
+ return;
+ }
+ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message));
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
+ if (message == null) {
+ return;
+ }
+ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
+ }
+
+ public void sendMessage(@Nullable Component message) {
+ if (message == null) {
+ return;
+ }
+ sendMessage(message, Util.NIL_UUID);
+ }
+ // Purpur end
+
@Override
public void sendMessage(Component message, UUID sender) {}
@@ -3982,4 +4019,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -4013,4 +4027,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -3754,7 +3724,7 @@ index c87d1f8a057e98f7f4ad7e11d89bfa791a7bae90..dca18730731407bb68ad32852c799406
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index fdc01dee8a81f0376f3c0a154c4291d03ead7f8f..8830121a89297cc49fb13a7ecac9e6d90f33969d 100644
index e1a593b464c35f68b22e84a09f99ee72af73da32..25ce1910a03947ce070b318f57379f0da5ac5db8 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -67,18 +67,50 @@ public class Slime extends Mob implements Enemy {