Skip to content

Commit d40f8f6

Browse files
committed
Optimize search command for tile entities on Paper servers
1 parent 82f960f commit d40f8f6

3 files changed

Lines changed: 20 additions & 3 deletions

File tree

pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<id>enginehub-repo</id>
3535
<url>https://maven.enginehub.org/repo/</url>
3636
</repository>
37+
<repository>
38+
<id>jitpack.io</id>
39+
<url>https://jitpack.io</url>
40+
</repository>
3741
</repositories>
3842

3943
<dependencies>
@@ -49,6 +53,12 @@
4953
<version>0.5.1</version>
5054
<scope>compile</scope>
5155
</dependency>
56+
<dependency>
57+
<groupId>com.github.RVSkeLe</groupId>
58+
<artifactId>PaperLib</artifactId>
59+
<version>1.1.0</version>
60+
<scope>compile</scope>
61+
</dependency>
5262
<dependency>
5363
<groupId>com.sk89q.worldguard</groupId>
5464
<artifactId>worldguard-bukkit</artifactId>
@@ -143,13 +153,18 @@
143153
<include>de.themoep:*</include>
144154
<include>de.themoep.utils:*</include>
145155
<include>com.tcoded:FoliaLib</include>
156+
<include>com.github.RVSkeLe:PaperLib</include>
146157
</includes>
147158
</artifactSet>
148159
<relocations>
149160
<relocation>
150161
<pattern>com.tcoded.folialib</pattern>
151162
<shadedPattern>de.themoep.entitydetection.libs.folialib</shadedPattern>
152163
</relocation>
164+
<relocation>
165+
<pattern>com.github.rvskele.paperlib</pattern>
166+
<shadedPattern>de.themoep.entitydetection.libs.paperlib</shadedPattern>
167+
</relocation>
153168
<relocation>
154169
<pattern>de.themoep.utils.lang</pattern>
155170
<shadedPattern>de.themoep.entitydetection.libs.lang</shadedPattern>
@@ -166,4 +181,4 @@
166181
</plugins>
167182
</build>
168183

169-
</project>
184+
</project>

src/main/java/de/themoep/entitydetection/searcher/ChunkSearchResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.themoep.entitydetection.searcher;
22

3+
import com.github.rvskele.paperlib.PaperLib;
34
import de.themoep.entitydetection.ChunkLocation;
45
import de.themoep.entitydetection.Utils;
56
import org.bukkit.Bukkit;
@@ -62,7 +63,7 @@ public void teleport(Player sender, SearchResultEntry<ChunkLocation> entry, int
6263
}
6364
}
6465

65-
for (BlockState b : chunk.getTileEntities()) {
66+
for (BlockState b : PaperLib.getTileEntities(chunk, false).getTileEntities()) {
6667
if (b.getType().toString().equals(entry.getEntryCount().get(0).getKey())) {
6768
loc = b.getLocation().add(0, 1, 0);
6869
break;

src/main/java/de/themoep/entitydetection/searcher/EntitySearch.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package de.themoep.entitydetection.searcher;
22

3+
import com.github.rvskele.paperlib.PaperLib;
34
import com.google.common.collect.Multimap;
45
import com.google.common.collect.MultimapBuilder;
56
import com.tcoded.folialib.impl.PlatformScheduler;
@@ -155,7 +156,7 @@ public void start() {
155156
scheduled++;
156157
scheduler.runAtLocation(chunk.getBlock(0, 0, 0).getLocation(), task -> {
157158
try {
158-
for (BlockState state : chunk.getTileEntities()) {
159+
for (BlockState state : PaperLib.getTileEntities(chunk, false).getTileEntities()) {
159160
Multimap<Class, Location> multiMap = blockStates.get(state.getType());
160161
if (multiMap == null) {
161162
multiMap = MultimapBuilder.hashKeys().arrayListValues().build();

0 commit comments

Comments
 (0)