geforkt von Mirrors/Paper
Move fastutil from a patch file to a library, and improve EAR
Dieser Commit ist enthalten in:
Ursprung
a4d29fef6a
Commit
1ac9958e8b
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -4,29 +4,6 @@ Date: Mon, 29 Feb 2016 18:48:17 -0600
|
|||||||
Subject: [PATCH] Timings v2
|
Subject: [PATCH] Timings v2
|
||||||
|
|
||||||
|
|
||||||
diff --git a/pom.xml b/pom.xml
|
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
|
||||||
--- a/pom.xml
|
|
||||||
+++ b/pom.xml
|
|
||||||
@@ -0,0 +0,0 @@
|
|
||||||
-
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
@@ -0,0 +0,0 @@
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
+ <groupId>net.sf.trove4j</groupId>
|
|
||||||
+ <artifactId>trove4j</artifactId>
|
|
||||||
+ <version>3.0.3</version>
|
|
||||||
+ <!-- Trove Provided by CraftBukkit -->
|
|
||||||
+ <scope>provided</scope>
|
|
||||||
+ </dependency>
|
|
||||||
+ <dependency>
|
|
||||||
<groupId>commons-lang</groupId>
|
|
||||||
<artifactId>commons-lang</artifactId>
|
|
||||||
<version>2.6</version>
|
|
||||||
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||||
|
31
Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch
Normale Datei
31
Spigot-API-Patches/add-Trove-and-FastUtil-to-Bukkit.patch
Normale Datei
@ -0,0 +1,31 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Aikar <aikar@aikar.co>
|
||||||
|
Date: Fri, 1 Apr 2016 00:02:47 -0400
|
||||||
|
Subject: [PATCH] add Trove and FastUtil to Bukkit
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -0,0 +0,0 @@
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
+ <groupId>net.sf.trove4j</groupId>
|
||||||
|
+ <artifactId>trove4j</artifactId>
|
||||||
|
+ <version>3.0.3</version>
|
||||||
|
+ <!-- Trove Provided by CraftBukkit -->
|
||||||
|
+ <scope>provided</scope>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>co.aikar</groupId>
|
||||||
|
+ <artifactId>fastutil-lite</artifactId>
|
||||||
|
+ <version>1.0</version>
|
||||||
|
+ <scope>provided</scope>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
<groupId>commons-lang</groupId>
|
||||||
|
<artifactId>commons-lang</artifactId>
|
||||||
|
<version>2.6</version>
|
||||||
|
--
|
@ -31,6 +31,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
public boolean ah;
|
public boolean ah;
|
||||||
public boolean impulse;
|
public boolean impulse;
|
||||||
public int portalCooldown;
|
public int portalCooldown;
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/World.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||||||
|
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
|
||||||
|
byte b0 = 32;
|
||||||
|
|
||||||
|
// Spigot start
|
||||||
|
- if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
|
||||||
|
+ if (flag && !org.spigotmc.ActivationRange.checkIfActive(entity)) {
|
||||||
|
entity.ticksLived++;
|
||||||
|
entity.inactiveTick();
|
||||||
|
} else {
|
||||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||||
|
@ -4,6 +4,23 @@ Date: Thu, 3 Mar 2016 04:00:11 -0600
|
|||||||
Subject: [PATCH] Timings v2
|
Subject: [PATCH] Timings v2
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -0,0 +0,0 @@
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
+ <groupId>co.aikar</groupId>
|
||||||
|
+ <artifactId>fastutil-lite</artifactId>
|
||||||
|
+ <version>1.0</version>
|
||||||
|
+ <scope>provided</scope>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
<groupId>net.sf.trove4j</groupId>
|
||||||
|
<artifactId>trove4j</artifactId>
|
||||||
|
<version>3.0.3</version>
|
||||||
diff --git a/src/main/java/co/aikar/timings/SpigotTimings.java b/src/main/java/co/aikar/timings/SpigotTimings.java
|
diff --git a/src/main/java/co/aikar/timings/SpigotTimings.java b/src/main/java/co/aikar/timings/SpigotTimings.java
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||||
|
4
pom.xml
4
pom.xml
@ -36,6 +36,10 @@
|
|||||||
<id>md_5-releases</id>
|
<id>md_5-releases</id>
|
||||||
<url>http://repo.md-5.net/content/repositories/releases/</url>
|
<url>http://repo.md-5.net/content/repositories/releases/</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>aikar</id>
|
||||||
|
<url>https://ci.emc.gs/nexus/content/repositories/aikar/</url>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren