OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove some outdated PAIL comments

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2021-04-04 17:14:53 +10:00
parent 7af71a460f
commit 79672394a1
3 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
View file

@ -26,7 +26,7 @@
this.m = Vec3D.ORIGIN;
this.p = Collections.emptyList();
this.b = worldserver;
@@ -81,16 +90,17 @@
@@ -81,16 +90,16 @@
if (!list.equals(this.p)) {
this.p = list;
@ -35,7 +35,6 @@
}
- if (this.tracker instanceof EntityItemFrame && this.tickCounter % 10 == 0) {
+ // PAIL : rename
+ if (this.tracker instanceof EntityItemFrame /*&& this.tickCounter % 10 == 0*/) { // CraftBukkit - Moved below, should always enter this block
EntityItemFrame entityitemframe = (EntityItemFrame) this.tracker;
ItemStack itemstack = entityitemframe.getItem();
@ -48,7 +47,7 @@
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -135,6 +145,17 @@
@@ -135,6 +144,17 @@
boolean flag2 = flag1 || this.tickCounter % 60 == 0;
boolean flag3 = Math.abs(i - this.yRot) >= 1 || Math.abs(j - this.xRot) >= 1;
@ -66,7 +65,7 @@
if (this.tickCounter > 0 || this.tracker instanceof EntityArrow) {
long k = PacketPlayOutEntity.a(vec3d.x);
long l = PacketPlayOutEntity.a(vec3d.y);
@@ -173,6 +194,7 @@
@@ -173,6 +193,7 @@
}
this.c();
@ -74,7 +73,7 @@
if (flag2) {
this.d();
}
@@ -181,6 +203,7 @@
@@ -181,6 +202,7 @@
this.yRot = i;
this.xRot = j;
}
@ -82,7 +81,7 @@
this.q = false;
}
@@ -196,7 +219,27 @@
@@ -196,7 +218,27 @@
++this.tickCounter;
if (this.tracker.velocityChanged) {
@ -111,7 +110,7 @@
this.tracker.velocityChanged = false;
}
@@ -211,14 +254,17 @@
@@ -211,14 +253,17 @@
PlayerConnection playerconnection = entityplayer.playerConnection;
entityplayer.playerConnection.getClass();
@ -132,7 +131,7 @@
}
Packet<?> packet = this.tracker.P();
@@ -234,6 +280,12 @@
@@ -234,6 +279,12 @@
if (this.tracker instanceof EntityLiving) {
Collection<AttributeModifiable> collection = ((EntityLiving) this.tracker).getAttributeMap().b();
@ -145,7 +144,7 @@
if (!collection.isEmpty()) {
consumer.accept(new PacketPlayOutUpdateAttributes(this.tracker.getId(), collection));
}
@@ -265,8 +317,14 @@
@@ -265,8 +316,14 @@
if (!list.isEmpty()) {
consumer.accept(new PacketPlayOutEntityEquipment(this.tracker.getId(), list));
}
@ -160,7 +159,7 @@
if (this.tracker instanceof EntityLiving) {
EntityLiving entityliving = (EntityLiving) this.tracker;
Iterator iterator = entityliving.getEffects().iterator();
@@ -307,6 +365,11 @@
@@ -307,6 +364,11 @@
Set<AttributeModifiable> set = ((EntityLiving) this.tracker).getAttributeMap().getAttributes();
if (!set.isEmpty()) {

18
paper-server/nms-patches/net/minecraft/world/entity/EntityLiving.patch
View file

@ -817,24 +817,6 @@
this.setFlag(7, false);
}
} else {
@@ -2047,7 +2477,7 @@
}
}
- this.updateEquipment();
+ this.updateEquipment(); // PAIL rename
if (this.ticksLived % 20 == 0) {
this.getCombatTracker().g();
}
@@ -2148,7 +2578,7 @@
}
- public void updateEquipment() {
+ public void updateEquipment() { // PAIL private->public; updateEquipment
Map<EnumItemSlot, ItemStack> map = this.q();
if (map != null) {
@@ -2411,6 +2841,7 @@
}

2
paper-server/nms-patches/net/minecraft/world/level/storage/loot/LootTableRegistry.patch
View file

@ -23,7 +23,7 @@
this.keyToLootTable = immutablemap;
+ // CraftBukkit start - build a reversed registry map
+ ImmutableMap.Builder<LootTable, MinecraftKey> lootTableToKeyBuilder = ImmutableMap.builder();
+ this.keyToLootTable.forEach((lootTable, key) -> lootTableToKeyBuilder.put(key, lootTable)); // PAIL rename keyToLootTable
+ this.keyToLootTable.forEach((lootTable, key) -> lootTableToKeyBuilder.put(key, lootTable));
+ this.lootTableToKey = lootTableToKeyBuilder.build();
+ // CraftBukkit end
}