Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Clarify patch titles

Browse Source
This commit is contained in:
Sotr
2020-04-15 22:10:13 +07:00
parent 44f01b0fd3
commit 5ee75e7aa4
23 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
patches/server/0001-Fix-errors-on-editors-and-add-ignores.patch Normal file
View File

@@ -0,0 +1,51 @@
From 2a283176f574b2b85e9c6281e55db4053ad37247 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 15 Apr 2020 00:52:56 +0700
Subject: [PATCH] Fix errors on editors and add ignores
diff --git a/.gitignore b/.gitignore
index 67fb370cad..9b89663438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/.classpath
/.project
/.settings
+/.factorypath
# netbeans
/nbproject
diff --git a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
index 9ebd7ecb7a..677ccffd00 100644
--- a/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
+++ b/src/main/java/com/destroystokyo/paper/util/PlayerMobDistanceMap.java
@@ -76,7 +76,7 @@ public final class PlayerMobDistanceMap {
final int centerX = currPosition.getX();
final int centerZ = currPosition.getZ();
- for (final Long2ObjectLinkedOpenHashMap.Entry<PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer>> entry : this.playerMap.long2ObjectEntrySet()) {
+ for (final it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry<PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer>> entry : this.playerMap.long2ObjectEntrySet()) { // Akarin - fix errors on eclipse
final long key = entry.getLongKey();
final PooledHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> map = entry.getValue();
diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
index f625da9f09..3f128565b4 100644
--- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
+++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
@@ -134,10 +134,10 @@ public abstract class AreaMap<E> {
final int centerX = MCUtil.getCoordinateX(currPosition);
final int centerZ = MCUtil.getCoordinateZ(currPosition);
- for (Iterator<Long2ObjectLinkedOpenHashMap.Entry<PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E>>> iterator = this.areaMap.long2ObjectEntrySet().fastIterator();
+ for (Iterator<it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry<PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E>>> iterator = this.areaMap.long2ObjectEntrySet().fastIterator(); // Akarin - fix errors on eclipse
iterator.hasNext();) {
- final Long2ObjectLinkedOpenHashMap.Entry<PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E>> entry = iterator.next();
+ final it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry<PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E>> entry = iterator.next(); // Akarin - fix errors on eclipse
final long key = entry.getLongKey();
final PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<E> map = entry.getValue();
--
2.25.1.windows.1