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

Merge branch 'master' of https://git.lumine.io/mmoteam/mmocore.git

Browse Source
This commit is contained in:
ASangarin 2020-09-12 20:41:48 +02:00
commit a56375a556
5 changed files with 174 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -1 +1,4 @@
![eclipse_SEyunr6cEZ](/uploads/4537bd2ada7d70653c7e26a0efc88565/eclipse_SEyunr6cEZ.png) Private repository for MMOCore.
Issues: https://git.lumine.io/mythiccraft/mmocore/-/issues
Wiki: https://git.lumine.io/mythiccraft/mmocore/-/wikis/home

BIN
lib/MMOItems.jar
View File

Binary file not shown.

BIN
lib/MMOLib.jar
View File

Binary file not shown.

324
pom.xml
View File

@ -1,166 +1,172 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOCore</artifactId> <artifactId>MMOCore</artifactId>
<version>1.4.5</version> <version>1.4.5</version>
<name>MMOCore</name> <name>MMOCore</name>
<description>Offer your players a brand new RPG experience.</description> <description>Offer your players a brand new RPG experience.</description>
<properties> <properties>
<build.number>SNAPSHOT</build.number> <build.number>SNAPSHOT</build.number>
<downloadSources>false</downloadSources> <downloadSources>false</downloadSources>
<downloadJavadocs>false</downloadJavadocs> <downloadJavadocs>false</downloadJavadocs>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>nexus</id> <id>nexus</id>
<name>Lumine Releases</name> <name>Lumine Releases</name>
<url>http://mvn.lumine.io/repository/maven-releases/</url> <url>http://mvn.lumine.io/repository/maven-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>nexus</id> <id>nexus</id>
<name>Lumine Snapshots</name> <name>Lumine Snapshots</name>
<url>http://mvn.lumine.io/repository/maven-snapshots/</url> <url>http://mvn.lumine.io/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<build> <build>
<finalName>${project.name}-${project.version}</finalName> <finalName>${project.name}-${project.version}</finalName>
<resources> <resources>
<resource> <resource>
<filtering>true</filtering> <filtering>true</filtering>
<directory>${basedir}/src/main/resources/</directory> <directory>${basedir}/src/main/resources/</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
<junitArtifactName>junit:junit</junitArtifactName> <junitArtifactName>junit:junit</junitArtifactName>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<inputEncoding>UTF-8</inputEncoding> <inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding> <outputEncoding>UTF-8</outputEncoding>
<argLine>-ea -Dfile.encoding=UTF-8</argLine> <argLine>-ea -Dfile.encoding=UTF-8</argLine>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository> </repository>
<repository> <repository>
<id>sk89q-repo</id> <id>sk89q-repo</id>
<url>https://maven.enginehub.org/repo/</url> <url>https://maven.enginehub.org/repo/</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <!-- MMOs -->
<groupId>net.Indyuce</groupId> <dependency>
<artifactId>mmoitems</artifactId> <groupId>net.Indyuce</groupId>
<version>5.1.2</version> <artifactId>mmoitems</artifactId>
<scope>system</scope> <version>6.1.2</version>
<systemPath>${basedir}/lib/MMOItems.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/MMOItems.jar</systemPath>
<dependency> </dependency>
<groupId>net.Indyuce</groupId> <dependency>
<artifactId>MMOLib</artifactId> <groupId>net.Indyuce</groupId>
<version>1.0</version> <artifactId>MMOLib</artifactId>
<scope>system</scope> <version>1.3</version>
<systemPath>${basedir}/lib/MMOLib.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/MMOLib.jar</systemPath>
</dependency>
<dependency> <!-- Minecraft -->
<groupId>org.spigotmc</groupId> <dependency>
<artifactId>spigot-api</artifactId> <groupId>org.spigotmc</groupId>
<version>1.14.4</version> <artifactId>spigot-api</artifactId>
<scope>system</scope> <version>1.12-R1-1.16-R2</version>
<systemPath>${basedir}/lib/spigot.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/spigot.jar</systemPath>
<dependency> </dependency>
<groupId>com.bekvon.bukkit</groupId>
<artifactId>Residence</artifactId> <!-- APIs -->
<version>4.8.7.2</version> <dependency>
<scope>system</scope> <groupId>org.jetbrains</groupId>
<systemPath>${basedir}/lib/Residence.jar</systemPath> <artifactId>annotations</artifactId>
</dependency> <version>19.0.0</version>
<dependency> </dependency>
<groupId>com.Zrips</groupId> <dependency>
<artifactId>CMI</artifactId> <groupId>mysql</groupId>
<version>8.6.5.0</version> <artifactId>mysql-connector-java</artifactId>
<scope>system</scope> <version>5.1.41</version>
<systemPath>${basedir}/lib/CMI.jar</systemPath> </dependency>
</dependency>
<dependency> <!-- Other Plugins -->
<groupId>com.sainttx.holograms</groupId> <dependency>
<artifactId>holograms</artifactId> <groupId>com.bekvon.bukkit</groupId>
<version>2.9.1</version> <artifactId>Residence</artifactId>
<scope>system</scope> <version>4.8.7.2</version>
<systemPath>${basedir}/lib/Holograms.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/Residence.jar</systemPath>
<dependency> </dependency>
<groupId>com.gmail.filoghost</groupId> <dependency>
<artifactId>HolographicDisplays</artifactId> <groupId>com.Zrips</groupId>
<version>6.9.1</version> <artifactId>CMI</artifactId>
<scope>system</scope> <version>8.6.5.0</version>
<systemPath>${basedir}/lib/HolographicDisplays.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/CMI.jar</systemPath>
<dependency> </dependency>
<groupId>io.lumine.xikage</groupId> <dependency>
<artifactId>MythicMobs</artifactId> <groupId>com.sainttx.holograms</groupId>
<version>4.8.0</version> <artifactId>holograms</artifactId>
<scope>system</scope> <version>2.9.1</version>
<systemPath>${basedir}/lib/MythicMobs.jar</systemPath> <scope>system</scope>
</dependency> <systemPath>${basedir}/lib/Holograms.jar</systemPath>
<dependency> </dependency>
<groupId>com.github.MilkBowl</groupId> <dependency>
<artifactId>VaultAPI</artifactId> <groupId>com.gmail.filoghost</groupId>
<version>1.7</version> <artifactId>HolographicDisplays</artifactId>
<scope>provided</scope> <version>6.9.1</version>
</dependency> <scope>system</scope>
<dependency> <systemPath>${basedir}/lib/HolographicDisplays.jar</systemPath>
<groupId>com.sk89q.worldguard</groupId> </dependency>
<artifactId>worldguard-bukkit</artifactId> <dependency>
<version>7.0.2-SNAPSHOT</version> <groupId>io.lumine.xikage</groupId>
<scope>provided</scope> <artifactId>MythicMobs</artifactId>
</dependency> <version>4.8.0</version>
<dependency> <scope>system</scope>
<groupId>net.citizensnpcs</groupId> <systemPath>${basedir}/lib/MythicMobs.jar</systemPath>
<artifactId>citizens</artifactId> </dependency>
<version>2.0.25-SNAPSHOT</version> <dependency>
<scope>system</scope> <groupId>com.github.MilkBowl</groupId>
<systemPath>${basedir}/lib/Citizens.jar</systemPath> <artifactId>VaultAPI</artifactId>
</dependency> <version>1.7</version>
<dependency> <scope>provided</scope>
<groupId>mysql</groupId> </dependency>
<artifactId>mysql-connector-java</artifactId> <dependency>
<version>5.1.41</version> <groupId>com.sk89q.worldguard</groupId>
</dependency> <artifactId>worldguard-bukkit</artifactId>
<dependency> <version>7.0.2-SNAPSHOT</version>
<groupId>me.clip</groupId> <scope>provided</scope>
<artifactId>placeholderapi</artifactId> </dependency>
<version>2.10.7</version> <dependency>
<scope>system</scope> <groupId>net.citizensnpcs</groupId>
<systemPath>${basedir}/lib/PlaceholderAPI.jar</systemPath> <artifactId>citizens</artifactId>
</dependency> <version>2.0.25-SNAPSHOT</version>
<dependency> <scope>system</scope>
<groupId>org.jetbrains</groupId> <systemPath>${basedir}/lib/Citizens.jar</systemPath>
<artifactId>annotations</artifactId> </dependency>
<version>19.0.0</version> <dependency>
</dependency> <groupId>me.clip</groupId>
</dependencies> <artifactId>placeholderapi</artifactId>
<version>2.10.7</version>
<scope>system</scope>
<systemPath>${basedir}/lib/PlaceholderAPI.jar</systemPath>
</dependency>
</dependencies>
</project> </project>

6
src/main/java/net/Indyuce/mmocore/listener/PartyListener.java
View File

@ -1,6 +1,7 @@
package net.Indyuce.mmocore.listener; package net.Indyuce.mmocore.listener;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -47,7 +48,10 @@ public class PartyListener implements Listener {
*/ */
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void b(PlayerAttackEvent event) { public void b(PlayerAttackEvent event) {
if (event.getEntity() instanceof Player) { LivingEntity entity = event.getEntity();
if (entity instanceof Player) {
if (entity.hasMetadata("NPC"))
return;
PlayerData targetData = PlayerData.get((Player) event.getEntity()); PlayerData targetData = PlayerData.get((Player) event.getEntity());
if (targetData.hasParty() && targetData.getParty().getMembers().has(event.getData().getMMOCore())) if (targetData.hasParty() && targetData.getParty().getMembers().has(event.getData().getMMOCore()))
event.setCancelled(true); event.setCancelled(true);