EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

2.1.92

Browse Source
This commit is contained in:
nossr50 2019-07-02 01:44:01 -07:00
parent 1ae9e80d96
commit 6e70258f9a
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Changelog.txt
View File

@ -1,18 +1,19 @@
Version 2.1.92 Version 2.1.92
Call Of The Wild (COTW) no longer cares if entities of the same type are nearby when attempting to summon a new entity Call Of The Wild (COTW) no longer cares if entities of the same type are nearby when attempting to summon a new entity
Most COTW messages have been tweaked and new COTW messages have been added
COTW Horses now always spawn in as adults
By default players are no longer allowed to breed COTW summoned animals with other animals, you can turn this off (see the notes)
Changed the sound effect for COTW (Fireworks -> Pop)
Fixed a bug where COTW summon limit was global instead of per player Fixed a bug where COTW summon limit was global instead of per player
The default summon limit for COTW is now per player instead of global which is how it is intended to be, for wolves this defaults to 2, for other entities it defaults to 1 If you are playing in 1.14 mcMMO will now summon cats instead of ocelots
There is now a small 150ms window in which you cannot summon an entity via COTW to prevent accidentally summoning extra entities The default summon limit for COTW is now per player instead of global which is how it should be, for wolves this defaults to 2, for other entities it defaults to 1
The setting named Summon_Max_Amount in config.yml has been renamed to Per_Player_Limit The COTW setting named Summon_Max_Amount in config.yml has been renamed to Per_Player_Limit
COTW entities now send the player a message when they die, time out, or get removed through other means By default players are no longer allowed to breed COTW summoned animals with other animals, you can turn this off (see the notes)
If a player tries to breed animals with a COTW animal and the server settings prevent this, they are informed via a message that it is not allowed
If the COTW summon has a lifespan, players are now informed about this lifespan when the entity is first summoned If the COTW summon has a lifespan, players are now informed about this lifespan when the entity is first summoned
COTW entities now send the player a message when they die, time out, or get removed through other means
COTW summons now have their name prefixed with some colored text to to make it easier to identify them. COTW summons now have their name prefixed with some colored text to to make it easier to identify them.
COTW summons now despawn if their owner logs out COTW summons now despawn if their owner logs out
If a player tries to breed animals with a COTW animal and the server settings prevent this, they are informed via a message that it is not allowed There is now a small 150ms window in which you cannot summon an entity via COTW to prevent accidentally summoning extra entities
COTW Horses, Cats, and Wolves now always spawn in as adults
Changed the sound effect for COTW (Fireworks -> Pop)
Most COTW messages have been tweaked and new COTW messages have been added
Added new setting to experience.yml 'ExploitFix.COTWBreeding' - Prevents breeding with COTW summoned entities when set to true, defaults to true Added new setting to experience.yml 'ExploitFix.COTWBreeding' - Prevents breeding with COTW summoned entities when set to true, defaults to true
Removed the 'mcmmo.ability.taming.callofthewild.renamepets' permission node as it is seen as unnecessary Removed the 'mcmmo.ability.taming.callofthewild.renamepets' permission node as it is seen as unnecessary

2
pom.xml
View File

@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.gmail.nossr50.mcMMO</groupId> <groupId>com.gmail.nossr50.mcMMO</groupId>
<artifactId>mcMMO</artifactId> <artifactId>mcMMO</artifactId>
<version>2.1.92-SNAPSHOT</version> <version>2.1.92</version>
<name>mcMMO</name> <name>mcMMO</name>
<url>https://github.com/mcMMO-Dev/mcMMO</url> <url>https://github.com/mcMMO-Dev/mcMMO</url>
<scm> <scm>

3
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -406,6 +406,7 @@ public class TamingManager extends SkillManager {
setBaseCOTWEntityProperties(callOfWildEntity); setBaseCOTWEntityProperties(callOfWildEntity);
((Wolf) callOfWildEntity).setAdult();
addToTracker(callOfWildEntity, CallOfTheWildType.WOLF); addToTracker(callOfWildEntity, CallOfTheWildType.WOLF);
//Setup wolf stats //Setup wolf stats
@ -429,9 +430,11 @@ public class TamingManager extends SkillManager {
if(callOfWildEntity instanceof Ocelot) { if(callOfWildEntity instanceof Ocelot) {
int numberOfTypes = Ocelot.Type.values().length; int numberOfTypes = Ocelot.Type.values().length;
((Ocelot) callOfWildEntity).setCatType(Ocelot.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); ((Ocelot) callOfWildEntity).setCatType(Ocelot.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]);
((Ocelot) callOfWildEntity).setAdult();
} else if(callOfWildEntity instanceof Cat) { } else if(callOfWildEntity instanceof Cat) {
int numberOfTypes = Cat.Type.values().length; int numberOfTypes = Cat.Type.values().length;
((Cat) callOfWildEntity).setCatType(Cat.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]); ((Cat) callOfWildEntity).setCatType(Cat.Type.values()[Misc.getRandom().nextInt(numberOfTypes)]);
((Cat) callOfWildEntity).setAdult();
} }
callOfWildEntity.setCustomName(LocaleLoader.getString("Taming.Summon.Name.Format", getPlayer().getName(), StringUtils.getPrettyEntityTypeString(entityType))); callOfWildEntity.setCustomName(LocaleLoader.getString("Taming.Summon.Name.Format", getPlayer().getName(), StringUtils.getPrettyEntityTypeString(entityType)));