Misc fixup

This commit is contained in:
ishland 2020-11-07 15:15:01 +08:00
parent 0ee1f14d69
commit 2b6de0fa5d
3 changed files with 11 additions and 20 deletions

View File

@ -6,6 +6,7 @@ on:
- '*.md'
- 'Jenkinsfile'
branches:
- ver/1.16.4
- ver/1.16.3
- ver/1.16.2
- ver/1.16.1
@ -15,6 +16,7 @@ on:
- '*.md'
- 'Jenkinsfile'
branches:
- ver/1.16.4
- ver/1.16.3
- ver/1.16.1
- ver/1.16.2
@ -74,5 +76,5 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: Yatopia-${{ matrix.java }}
path: yatopia-1.16.3-paperclip.jar
path: yatopia-1.16.4-paperclip.jar

View File

@ -10,17 +10,17 @@ # Patches
| ----- | ------------- |:-------------:| -----:|
| server | Add 5 second tps average in /tps | William Blake Galbreath | |
| api | Add ChatColor.getById | Aikar | |
| api | Add GameProfileLookupEvent | tr7zw | |
| server | Add GameProfileLookupEvent | tr7zw | |
| api | Add GameProfileLookupEvent | tr7zw | |
| server | Add GlueList | Mykyta Komarn | |
| server | Add IntelliJ IDEA runnable | Bud Gidiere | |
| server | Add JsonList save timings | Ivan Pekov | |
| api | Add NBT API as a first-class lib | tr7zw | |
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add StructureLocateEvent | dfsek | |
| api | Add NBT API as a first-class lib | tr7zw | |
| server | Add StructureLocateEvent | dfsek | |
| api | Add last tick time API | Ivan Pekov | tr7zw |
| api | Add StructureLocateEvent | dfsek | |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| api | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add no-tick block list | William Blake Galbreath | |
| server | Add nspt command | Ivan Pekov | |
| server | Add option to disable dolphin treasure searching | William Blake Galbreath | |
@ -77,8 +77,8 @@ # Patches
| server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | |
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
| server | Make sure the block is cauldron before proceeding | Ivan Pekov | |
| api | Modify POM | YatopiaMC | |
| server | Modify POM | YatopiaMC | |
| api | Modify POM | YatopiaMC | |
| server | Modify default configs | tr7zw | |
| server | Nuke streams off BlockPosition | Ivan Pekov | |
| server | Nuke streams off SectionPosition | Ivan Pekov | |
@ -98,12 +98,13 @@ # Patches
| server | PaperPR: Use block distance in portal search radius | Patrick Hemmer | |
| server | Per entity (type) collision settings | MrIvanPlays | tr7zw |
| server | Persistent TileEntity Lore and DisplayName | jmp | |
| api | PlayerAttackEntityEvent | Ivan Pekov | |
| server | PlayerAttackEntityEvent | Ivan Pekov | |
| api | ProxyForwardDataEvent | Ivan Pekov | |
| api | PlayerAttackEntityEvent | Ivan Pekov | |
| server | ProxyForwardDataEvent | Ivan Pekov | |
| api | ProxyForwardDataEvent | Ivan Pekov | |
| server | Purpur config files | William Blake Galbreath | |
| server | Redirect Configs | tr7zw | |
| api | Remove Streams using IntelliJ IDEA | ㄗㄠˋ ㄑㄧˊ | |
| server | Remove some streams and object allocations | Phoenix616 | |
| server | Remove vanilla profiler callers | Sotr | |
| server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | |

View File

@ -45,15 +45,3 @@ index f6ffefd7e356c9c68cb6591cab55de9363442faf..eddf3dff9a00bf3c7318745e52befd4c
Optional<VillagePlaceRecord> optional = Optional.empty();
if (!list.isEmpty()) {
list.sort(comparator);
diff --git a/src/main/java/net/minecraft/server/VillagePlaceRecord.java b/src/main/java/net/minecraft/server/VillagePlaceRecord.java
index 6eaf9fc9cc93f79a497b07a3549d459ba66be849..e28c673344564ea916b9e198df726a656f7e4e49 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceRecord.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceRecord.java
@@ -62,6 +62,7 @@ public class VillagePlaceRecord {
return this.c != this.b.b();
}
+ public final BlockPosition getPosition() { return f(); } // Yatopia - OBFHELPER
public BlockPosition f() {
return this.a;
}