Skip to content

Commit 3990fa1

Browse files
SpaceWalkerRSSpaceWalkerRS
committed
DamageSource tweaks and fixes
fixes #192
1 parent 3c40a43 commit 3990fa1

6 files changed

+40
-40
lines changed

‎mappings/14w25a#14w25b.tinydiff‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ c net/minecraft/unmapped/C_6588851
145145
c net/minecraft/unmapped/C_0591668
146146
m (Lnet/minecraft/unmapped/C_1013763;Lnet/minecraft/unmapped/C_1013763;ID)V m_1165727 affectHealth
147147
p 1 thrower
148-
p 2 entity
149-
p 3 multiplier
150-
p 4 strength
148+
p 2 target
149+
p 3 amplifier
150+
p 4 proximity
151151
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;ID)V m_1165727 affectHealth
152-
p 1 thrower
153-
p 2 entity
154-
p 3 multiplier
155-
p 4 strength
152+
p 1 potion
153+
p 2 thrower
154+
p 3 target
155+
p 4 amplifier
156156
p 5 proximity
157157
c net/minecraft/unmapped/C_1756552
158158
m ()Z m_0974034 m_0974034

‎mappings/b1.7.3#b1.8-pre1-201109081459.tinydiff‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3920,7 +3920,7 @@ c net/minecraft/unmapped/C_4440176 net/minecraft/block/MelonBlock
39203920
m (Ljava/util/Random;)I m_6534436 m_6534436
39213921
p 1 p_1
39223922
c net/minecraft/unmapped/C_4539334 net/minecraft/entity/damage/ProjectileDamageSource
3923-
f Lnet/minecraft/unmapped/C_1013763; f_9156792 projectile
3923+
f Lnet/minecraft/unmapped/C_1013763; f_9156792 shooter
39243924
m (Ljava/lang/String;Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)V <init> <init>
39253925
p 1 p_1
39263926
p 2 p_2
@@ -4586,16 +4586,16 @@ c net/minecraft/unmapped/C_6907923 net/minecraft/entity/damage/DamageSource
45864586
f F f_5642148 exhaustion
45874587
f Ljava/lang/String; f_1881974 name
45884588
m (Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8347011 mob
4589-
p 0 entity
4589+
p 0 mob
45904590
m (Lnet/minecraft/unmapped/C_5009044;)Lnet/minecraft/unmapped/C_6907923; m_5689068 player
4591-
p 0 attacker
4591+
p 0 player
45924592
m (Lnet/minecraft/unmapped/C_3688914;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_1002898 arrow
45934593
p 0 p_0
45944594
p 1 p_1
4595-
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fire
4595+
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fireball
45964596
p 0 p_0
45974597
p 1 p_1
4598-
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrownProjectile
4598+
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrown
45994599
p 0 p_0
46004600
p 1 p_1
46014601
m ()Z m_7796231 bypassesArmor

‎mappings/b1.7.3#b1.8-pre1-201109091357.tinydiff‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,7 +2804,7 @@ c net/minecraft/unmapped/C_4440176 net/minecraft/block/MelonBlock
28042804
m (Ljava/util/Random;)I m_6534436 m_6534436
28052805
p 1 p_1
28062806
c net/minecraft/unmapped/C_4539334 net/minecraft/entity/damage/ProjectileDamageSource
2807-
f Lnet/minecraft/unmapped/C_1013763; f_9156792 projectile
2807+
f Lnet/minecraft/unmapped/C_1013763; f_9156792 shooter
28082808
m (Ljava/lang/String;Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)V <init> <init>
28092809
p 1 p_1
28102810
p 2 p_2
@@ -3594,16 +3594,16 @@ c net/minecraft/unmapped/C_6907923 net/minecraft/entity/damage/DamageSource
35943594
f F f_5642148 exhaustion
35953595
f Ljava/lang/String; f_1881974 name
35963596
m (Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8347011 mob
3597-
p 0 entity
3597+
p 0 mob
35983598
m (Lnet/minecraft/unmapped/C_5009044;)Lnet/minecraft/unmapped/C_6907923; m_5689068 player
3599-
p 0 attacker
3599+
p 0 player
36003600
m (Lnet/minecraft/unmapped/C_3688914;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_1002898 arrow
36013601
p 0 p_0
36023602
p 1 p_1
3603-
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fire
3603+
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fireball
36043604
p 0 p_0
36053605
p 1 p_1
3606-
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrownProjectile
3606+
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrown
36073607
p 0 p_0
36083608
p 1 p_1
36093609
m ()Z m_7796231 bypassesArmor

‎mappings/b1.8-pre1-201109091357#b1.8-pre2.tinydiff‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,16 @@ c net/minecraft/unmapped/C_1481722
159159
p 1 metadata
160160
m ()I m_6083596 getCarriedBlockMetadata
161161
c net/minecraft/unmapped/C_4539334
162-
f Lnet/minecraft/unmapped/C_1013763; f_9156792 projectile
163-
f Lnet/minecraft/unmapped/C_6385858; f_9156792 projectile
162+
f Lnet/minecraft/unmapped/C_1013763; f_9156792 shooter
163+
f Lnet/minecraft/unmapped/C_6385858; f_9156792 shooter
164164
m (Ljava/lang/String;Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)V <init> <init>
165165
p 1 p_1
166166
p 2 p_2
167167
p 3 p_3
168168
m (Ljava/lang/String;Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;)V <init> <init>
169169
p 1 name
170-
p 2 shooter
171-
p 3 projectile
170+
p 2 projectile
171+
p 3 shooter
172172
c net/minecraft/unmapped/C_4873144
173173
f I f_8434619 f_8434619
174174
f I f_4819872 f_4819872
@@ -187,21 +187,21 @@ c net/minecraft/unmapped/C_6907923
187187
m (Lnet/minecraft/unmapped/C_3688914;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_1002898 arrow
188188
p 0 p_0
189189
p 1 p_1
190-
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fire
190+
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fireball
191191
p 0 p_0
192192
p 1 p_1
193-
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrownProjectile
193+
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_1013763;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrown
194194
p 0 p_0
195195
p 1 p_1
196196
m (Lnet/minecraft/unmapped/C_3688914;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_1002898 arrow
197197
p 0 arrow
198-
p 1 entity
199-
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fire
200-
p 0 projectileEntity
201-
p 1 entity
202-
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrownProjectile
203-
p 0 projectile
204-
p 1 attacker
198+
p 1 shooter
199+
m (Lnet/minecraft/unmapped/C_9746149;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_8649664 fireball
200+
p 0 fireball
201+
p 1 shooter
202+
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_6087183 thrown
203+
p 0 thrown
204+
p 1 thrower
205205
c net/minecraft/unmapped/C_7015659
206206
m (Lnet/minecraft/unmapped/C_3906126;III)V m_8601467 grow
207207
p 1 world

‎mappings/b1.9-pre3-201110061350#b1.9-pre4-201110131434.tinydiff‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -888,9 +888,9 @@ c net/minecraft/unmapped/C_0509876
888888
c net/minecraft/unmapped/C_0591668
889889
m (Lnet/minecraft/unmapped/C_1013763;Lnet/minecraft/unmapped/C_1013763;ID)V m_1165727 affectHealth
890890
p 1 thrower
891-
p 2 entity
892-
p 3 multiplier
893-
p 4 strength
891+
p 2 target
892+
p 3 amplifier
893+
p 4 proximity
894894
c net/minecraft/unmapped/C_0624720
895895
m ()I m_7924200 getCenterX
896896
m ()I m_8592971 getCenterY
@@ -981,8 +981,8 @@ c net/minecraft/unmapped/C_5908980
981981
p 3 p_3
982982
c net/minecraft/unmapped/C_6907923
983983
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_9605258 magic
984-
p 0 magic
985-
p 1 attacker
984+
p 0 potion
985+
p 1 thrower
986986
c net/minecraft/unmapped/C_7015659
987987
m (Lnet/minecraft/unmapped/C_3906126;IIIIF)V m_5653339 m_5653339
988988
p 1 p_1

‎mappings/b1.9-pre3-201110061402#b1.9-pre4-201110131434.tinydiff‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,9 +1130,9 @@ c net/minecraft/unmapped/C_0509876
11301130
c net/minecraft/unmapped/C_0591668
11311131
m (Lnet/minecraft/unmapped/C_1013763;Lnet/minecraft/unmapped/C_1013763;ID)V m_1165727 affectHealth
11321132
p 1 thrower
1133-
p 2 entity
1134-
p 3 multiplier
1135-
p 4 strength
1133+
p 2 target
1134+
p 3 amplifier
1135+
p 4 proximity
11361136
c net/minecraft/unmapped/C_0624720
11371137
m ()I m_7924200 getCenterX
11381138
m ()I m_8592971 getCenterY
@@ -1232,8 +1232,8 @@ c net/minecraft/unmapped/C_6907923
12321232
m (Lnet/minecraft/unmapped/C_5009044;)Ljava/lang/String; m_7501958 getDeathMessage
12331233
p 1 player
12341234
m (Lnet/minecraft/unmapped/C_6385858;Lnet/minecraft/unmapped/C_6385858;)Lnet/minecraft/unmapped/C_6907923; m_9605258 magic
1235-
p 0 magic
1236-
p 1 attacker
1235+
p 0 potion
1236+
p 1 thrower
12371237
c net/minecraft/unmapped/C_6950351
12381238
m (ILnet/minecraft/unmapped/C_1283912;)V <init> <init>
12391239
p 1 entityId

0 commit comments

Comments
 (0)