mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
fb64f9a068
Upstream has released updates that appears to apply and compile correctly
Tuinity Changes:
8750b61 Fix entity count in timings and add water-ambient to per world spawn limits
2d9c2c8 Improve concurrent UserCache access
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Fri, 14 Dec 2018 21:52:29 -0800
|
|
Subject: [PATCH] Tuinity API Changes
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 15ce1c66462351d6d1ba55c111db13ef1c9f0789..63dfd1c647fd4d3b9b9924627d766c095d286f14 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -3,18 +3,18 @@
|
|
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>
|
|
<parent>
|
|
- <groupId>com.destroystokyo.paper</groupId>
|
|
- <artifactId>paper-parent</artifactId>
|
|
+ <groupId>com.tuinity</groupId>
|
|
+ <artifactId>tuinity-parent</artifactId>
|
|
<version>dev-SNAPSHOT</version>
|
|
+ <relativePath>../pom.xml</relativePath>
|
|
</parent>
|
|
|
|
- <groupId>com.destroystokyo.paper</groupId>
|
|
- <artifactId>paper-api</artifactId>
|
|
+ <artifactId>tuinity-api</artifactId>
|
|
<version>1.16.1-R0.1-SNAPSHOT</version>
|
|
<packaging>jar</packaging>
|
|
|
|
- <name>Paper-API</name>
|
|
- <url>https://github.com/PaperMC/Paper</url>
|
|
+ <name>Tuinity-API</name>
|
|
+ <url>https://github.com/Spottedleaf/Tuinity</url>
|
|
<description>An enhanced plugin API for Minecraft servers.</description>
|
|
|
|
<properties>
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 0653e0ffe96748dc971ec7e8027f8159696adf62..65a40c4a9b24fa607d284e203becba034520b75d 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1438,6 +1438,14 @@ public interface Server extends PluginMessageRecipient {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Tuinity start - add config to timings report
|
|
+ @NotNull
|
|
+ public org.bukkit.configuration.file.YamlConfiguration getTuinityConfig()
|
|
+ {
|
|
+ throw new UnsupportedOperationException("Not supported yet.");
|
|
+ }
|
|
+ // Tuinity end - add config to timings report
|
|
+
|
|
/**
|
|
* Sends the component to the player
|
|
*
|