Skip to content

Commit 3e7c131

Browse files
committed
Some fixes
1 parent 0668fc7 commit 3e7c131

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<#include "mcelements.ftl">
2-
if(${input$entity} instanceof PlayerEntity) ((PlayerEntity) ${input$entity}).setSpawnPoint(${toBlockPos(input$x,input$y,input$z)}, true, ${input$entity}.dimension);
2+
if(${input$entity} instanceof PlayerEntity) ((PlayerEntity) ${input$entity}).setSpawnPoint(${toBlockPos(input$x,input$y,input$z)}, true, false, ${input$entity}.dimension);

src/main/resources/forge-1.15.2/procedures/utils/projectiles/arrow_weapon.java.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ private static AbstractArrowEntity createArrowWeaponItemStack(AbstractArrowEntit
22
if (knockback > 0)
33
entityToSpawn.setKnockbackStrength(knockback);
44
if (piercing > 0)
5-
entityToSpawn.func_213872_b(piercing);
5+
entityToSpawn.setPierceLevel(piercing);
66
return entityToSpawn;
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<#include "mcelements.ftl">
2-
(world.getWorld() instanceof ServerWorld && ((ServerWorld) world.getWorld()).func_217483_b_(${toBlockPos(input$x,input$y,input$z)}))
2+
(world.getWorld() instanceof ServerWorld && ((ServerWorld) world.getWorld()).isVillage(${toBlockPos(input$x,input$y,input$z)}))

src/main/resources/forge-1.15.2/templates/item/item.java.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class ${name}Item extends <#if data.hasBannerPatterns()>BannerPattern<#el
8080
}
8181

8282
<#if data.hasBannerPatterns()> <#-- Workaround to allow both music disc and patterns info in description -->
83-
@Override @OnlyIn(Dist.CLIENT) public IFormattableTextComponent func_219981_d_() {
83+
@Override @OnlyIn(Dist.CLIENT) public ITextComponent func_219981_d() {
8484
return new TranslationTextComponent(this.getTranslationKey() + ".patterns");
8585
}
8686
</#if>
@@ -352,7 +352,7 @@ public class ${name}Item extends <#if data.hasBannerPatterns()>BannerPattern<#el
352352
${projectileClass} projectile = ${projectileClass}.shoot(world, entity, world.getRandom()<#if data.rangedItemChargesPower>, pullingPower</#if>);
353353
<#elseif projectile.endsWith("Arrow")>
354354
${projectileClass} projectile = new ${projectileClass}(world, entity);
355-
projectile.func_234612_a_(entity, entity.rotationPitch, entity.rotationYaw, 0, <#if data.rangedItemChargesPower>pullingPower * </#if>3.15f, 1.0F);
355+
projectile.shoot(entity, entity.rotationPitch, entity.rotationYaw, 0, <#if data.rangedItemChargesPower>pullingPower * </#if>3.15f, 1.0F);
356356
world.addEntity(projectile);
357357
world.playSound(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), ForgeRegistries.SOUND_EVENTS
358358
.getValue(new ResourceLocation("entity.arrow.shoot")), SoundCategory.PLAYERS, 1, 1f / (world.getRandom().nextFloat() * 0.5f + 1));

0 commit comments

Comments
 (0)