Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Support for latest ML

Browse Source
This commit is contained in:
Indyuce 2022-01-22 14:34:48 +01:00
parent 5dd1e2534e
commit 67cd4e44d1
6 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -44,8 +44,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>9</source>
<target>9</target>
<encoding>UTF-8</encoding>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
@ -140,7 +140,7 @@
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib-dist</artifactId>
<version>1.3-R20-SNAPSHOT</version>
<version>1.3-R21-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

3
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -101,7 +101,7 @@ public class MMOCore extends LuminePlugin {
public boolean shouldDebugSQL = false;
private static final int MYTHICLIB_COMPATIBILITY_INDEX = 3;
private static final int MYTHICLIB_COMPATIBILITY_INDEX = 4;
public MMOCore() {
plugin = this;
@ -362,7 +362,6 @@ public class MMOCore extends LuminePlugin {
// Clear spawned loot chests
lootChests.getActive().forEach(chest -> chest.unregister(false));
}
/**

10
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -246,20 +246,18 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
@Override
public int getClaims(ExperienceObject object, ExperienceTable table, ExperienceItem item) {
String key = object.geyKey() + "." + table.getId() + "." + item.getId();
String key = object.getKey() + "." + table.getId() + "." + item.getId();
return tableItemClaims.get(key);
}
@Override
public void setClaims(ExperienceObject object, ExperienceTable table, ExperienceItem item, int times) {
String key = object.geyKey() + "." + table.getId() + "." + item.getId();
String key = object.getKey() + "." + table.getId() + "." + item.getId();
tableItemClaims.put(key, times);
}
@Deprecated(since = "1.9")
public void setProfessionExpItemClaims(String professionTableItemKey, int times) {
Validate.isTrue(!professionTableItemKey.startsWith("class.") && !professionTableItemKey.startsWith("profession."), "Invalid exp item key");
tableItemClaims.put("profession." + professionTableItemKey, times);
public Map<String, Integer> getItemClaims() {
return tableItemClaims;
}
/**

2
src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
View File

@ -218,7 +218,7 @@ public class PlayerClass extends PostLoadObject implements ExperienceObject {
}
@Override
public String geyKey() {
public String getKey() {
return "class." + getId();
}

2
src/main/java/net/Indyuce/mmocore/experience/ExperienceObject.java
View File

@ -11,7 +11,7 @@ import javax.annotation.Nullable;
*/
public interface ExperienceObject {
String geyKey();
String getKey();
/**
* Indicates the amount of exp required to level up

2
src/main/java/net/Indyuce/mmocore/skill/list/Sneaky_Picky.java
View File

@ -30,7 +30,7 @@ public class Sneaky_Picky extends SkillHandler<SimpleSkillResult> implements Lis
@Override
public void whenCast(SimpleSkillResult result, SkillMetadata skillMeta) {
LivingEntity target = (LivingEntity) skillMeta.getTargetEntity();
skillMeta.getAttack().getDamage().multiply(1 + skillMeta.getModifier("extra") / 100, DamageType.WEAPON);
skillMeta.getAttack().getDamage().multiplicativeModifier(1 + skillMeta.getModifier("extra") / 100, DamageType.WEAPON);
target.getWorld().spawnParticle(Particle.SMOKE_NORMAL, target.getLocation().add(0, target.getHeight() / 2, 0), 64, 0, 0, 0, .05);
target.getWorld().playSound(target.getLocation(), Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 1, 2);
}