mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Make 'cannot mount mob' string configurable
This commit is contained in:
William Blake Galbreath
@@ -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
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 06bc2751ebfd115af5d64546bf8c007a25f4abee Mon Sep 17 00:00:00 2001
|
||||
From 13f3c9bd39aba9a4baa9f93e4020e4378a42de1c Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 8 Aug 2019 15:29:15 -0500
|
||||
Subject: [PATCH] Implement AFK API
|
||||
@@ -14,8 +14,8 @@ Subject: [PATCH] Implement AFK API
|
||||
.../net/pl3x/purpur/PurpurWorldConfig.java | 11 +++++
|
||||
.../craftbukkit/entity/CraftPlayer.java | 17 ++++++++
|
||||
.../java/org/spigotmc/ActivationRange.java | 1 +
|
||||
src/main/resources/purpur.lang | 5 ++-
|
||||
11 files changed, 112 insertions(+), 25 deletions(-)
|
||||
src/main/resources/purpur.lang | 4 +-
|
||||
11 files changed, 111 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 4a24f38885..1454c2fa4d 100644
|
||||
@@ -288,15 +288,16 @@ index 795817177a..17c4d7ec9b 100644
|
||||
ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
|
||||
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index 0967ef424b..f4694dbcce 100644
|
||||
index 7125c0477e..e925e1374d 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1 +1,4 @@
|
||||
-{}
|
||||
+{
|
||||
@@ -1,3 +1,5 @@
|
||||
{
|
||||
- "cannot.ride.mob": "You cannot mount that mob"
|
||||
+ "cannot.ride.mob": "You cannot mount that mob",
|
||||
+ "idle.timeout.broadcast.away": "§e§o%s is now AFK",
|
||||
+ "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
|
||||
+}
|
||||
}
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 28c67bdc1d03076db4d750dec7eef75241d74f62 Mon Sep 17 00:00:00 2001
|
||||
From 3d3d61859962afb1eca34aa2c9ecb70bb94c18ef Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 13 Mar 2020 22:23:44 -0500
|
||||
Subject: [PATCH] Add /mspt command
|
||||
@@ -88,11 +88,12 @@ index 0000000000..c3ffe528d4
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index f4694dbcce..151ea90928 100644
|
||||
index e925e1374d..8d670b3650 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1,4 +1,6 @@
|
||||
@@ -1,5 +1,7 @@
|
||||
{
|
||||
"cannot.ride.mob": "You cannot mount that mob",
|
||||
+ "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
|
||||
+ "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
|
||||
"idle.timeout.broadcast.away": "§e§o%s is now AFK",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 20c146c300aba9ff89590434311da7938c305d19 Mon Sep 17 00:00:00 2001
|
||||
From 19fb72c1a63969314198cf85c3666e2bdd53f1cc Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 13 Mar 2020 22:29:10 -0500
|
||||
Subject: [PATCH] Add /ping command
|
||||
@@ -115,11 +115,11 @@ index 0000000000..dac3083bf0
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index 151ea90928..63a5ad0037 100644
|
||||
index 8d670b3650..4326c04b27 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
@@ -2,6 +2,7 @@
|
||||
"cannot.ride.mob": "You cannot mount that mob",
|
||||
"commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
|
||||
"commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
|
||||
+ "commands.purpur.ping": "§a%s's ping is %sms",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 8d8701c00b50db97c0505a03a41ae80c99be488d Mon Sep 17 00:00:00 2001
|
||||
From e56e6f36485ffce8e437523aed7befaa76c8de69 Mon Sep 17 00:00:00 2001
|
||||
From: tr7zw <tr7zw@live.de>
|
||||
Date: Thu, 5 Mar 2020 23:08:01 +0100
|
||||
Subject: [PATCH] YAPFA - Disable mojang profiler
|
||||
@@ -160,11 +160,12 @@ index 7b7e1475b3..1136a0a26d 100644
|
||||
|
||||
// Paper start
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index 63a5ad0037..120b10b9a7 100644
|
||||
index 4326c04b27..c16e603c97 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1,4 +1,5 @@
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"cannot.ride.mob": "You cannot mount that mob",
|
||||
+ "commands.purpur.debug.disabled": "The debug profiler is disabled",
|
||||
"commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
|
||||
"commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
|
||||
|
||||
Reference in New Issue
Block a user