Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-01-29 18:51:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-05-06 11:40:28 -04:00
commit d0c79f0347
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "SongodaCore" name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.3.30" version: "2.3.31"
build: build:
stage: build stage: build

6
Core/pom.xml
View File

@ -115,9 +115,9 @@
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>com.destroystokyo.papermc</groupId>
<artifactId>spigot</artifactId> <artifactId>paper</artifactId>
<version>1.15</version> <version>1.15.2</version>
</dependency> </dependency>
<!--dependency> <!--dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>

2
Core/src/main/java/com/songoda/core/commands/CommandManager.java
View File

@ -315,7 +315,7 @@ public class CommandManager implements CommandExecutor, TabCompleter {
// If we're on Paper 1.8, we need to register timings (spigot creates timings on init, paper creates it on register) // If we're on Paper 1.8, we need to register timings (spigot creates timings on init, paper creates it on register)
// later versions of paper create timings if needed when the command is executed // later versions of paper create timings if needed when the command is executed
if (ServerProject.isServer(ServerProject.PAPER, ServerProject.TACO) && ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) { if (ServerProject.isServer(ServerProject.PAPER, ServerProject.TACO) && ServerVersion.isServerVersionBelow(ServerVersion.V1_9)) {
//commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject); commandObject.timings = co.aikar.timings.TimingsManager.getCommandTiming(plugin.getName().toLowerCase(), commandObject);
} }
// Set command action // Set command action

4
Core/src/main/java/com/songoda/core/compatibility/ClientVersion.java
View File

@ -87,6 +87,10 @@ public class ClientVersion {
case 490: case 490:
case 498: case 498:
return ServerVersion.V1_14; return ServerVersion.V1_14;
case 573:
case 575:
case 578:
return ServerVersion.V1_15;
} }
return version > 498 ? ServerVersion.getServerVersion() : ServerVersion.UNKNOWN; return version > 498 ? ServerVersion.getServerVersion() : ServerVersion.UNKNOWN;
} }