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

Make 'cannot mount mob' string configurable

Browse Source
This commit is contained in:
William Blake Galbreath
2020-04-12 13:32:59 -05:00
parent e8ec02d1d4
commit b2a0de5386
5 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From e51672ab45d21a513bb38ecb7e4aa3446f074d43 Mon Sep 17 00:00:00 2001
From 3f896a527678b6dd67981570d466f6e38aabe85e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -103,7 +103,8 @@ Subject: [PATCH] Ridables
.../net/pl3x/purpur/entity/PhantomFlames.java | 126 ++++
.../pathfinder/PathfinderGoalHasRider.java | 21 +
.../craftbukkit/entity/CraftEntity.java | 27 +
99 files changed, 3620 insertions(+), 210 deletions(-)
src/main/resources/purpur.lang | 4 +-
100 files changed, 3623 insertions(+), 211 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -2349,7 +2350,7 @@ index 81b7cd06f2..3e6722cfce 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1991cee43d..28218f048d 100644
index 1991cee43d..d0a5687f03 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2430,7 +2431,7 @@ index 1991cee43d..28218f048d 100644
+ }
+ }
+ if (!entityhuman.getBukkitEntity().hasPermission("allow.ride." + getEntityType().getName())) {
+ entityhuman.getBukkitEntity().sendMessage("You cannot mount that mob");
+ entityhuman.sendMessage(LocaleLanguage.translate("cannot.ride.mob"));
+ return false;
+ }
+ entityhuman.mounting = true;
@@ -6557,6 +6558,15 @@ index dfa15372b8..350aa67549 100644
+ }
+ // Purpur end
}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 0967ef424b..7125c0477e 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1 +1,3 @@
-{}
+{
+ "cannot.ride.mob": "You cannot mount that mob"
+}
--
2.24.0