Version 1.2.8 Changes

ZeroniaServer · Jul 9, 2022 · 844ebb6 · 844ebb6
1 parent 09118ed
commit 844ebb6
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/rocketriders/data/everytick/functions/new_player.mcfunction b/rocketriders/data/everytick/functions/new_player.mcfunction
@@ -8,7 +8,7 @@ execute as @a[scores={firstJoined=0}] at @s run playsound minecraft:entity.playe
 execute as @a[scores={firstJoined=0}] at @s run playsound minecraft:entity.firework_rocket.twinkle_far master @s ~ ~ ~ 1 1.5
 title @a[scores={firstJoined=0}] times 10 80 20
 title @a[scores={firstJoined=0}] title [{"text":"Welcome to","color":"white"}]
-title @a[scores={firstJoined=0}] subtitle [{"text":"Rocket ","color":"blue","bold":true},{"text":"Riders","color":"gold","bold":true},{"text":" v1.2.7!","color":"green","bold":false}]
+title @a[scores={firstJoined=0}] subtitle [{"text":"Rocket ","color":"blue","bold":true},{"text":"Riders","color":"gold","bold":true},{"text":" v1.2.8!","color":"green","bold":false}]
 
 #Handle achievements
 execute if entity @s[scores={servermode=0},tag=!realms,tag=!SMCustom] as @a[scores={firstJoined=0}] run function achievements:roots

diff --git a/rocketriders/data/everytick/functions/splash.mcfunction b/rocketriders/data/everytick/functions/splash.mcfunction
@@ -4,8 +4,8 @@
 ######################################
 
 ##Splash projectile motion/effects
-execute as @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water"}}},tag=!splash] run data merge entity @s {NoGravity:1b,Motion:[0.0,0.0,0.0],Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water",CustomPotionColor:3237342,CustomPotionEffects:[{Duration:1,Id:23b,Amplifier:0b,ShowParticles:0b}]}}}
-tag @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water",CustomPotionColor:3237342,CustomPotionEffects:[{Duration:1,Id:23b,Amplifier:0b,ShowParticles:0b}]}}},tag=!splash] add splash
+execute as @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water"}}},tag=!splash] run data merge entity @s {NoGravity:1b,Motion:[0.0,0.0,0.0],Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water",CustomPotionColor:3237342,CustomPotionEffects:[{Duration:1,Id:23,Amplifier:0b,ShowParticles:0b}]}}}
+tag @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:water",CustomPotionColor:3237342,CustomPotionEffects:[{Duration:1,Id:23,Amplifier:0b,ShowParticles:0b}]}}},tag=!splash] add splash
 execute as @e[type=potion,tag=splash,tag=!motioned] at @s as @p[scores={ThrowSplash=1..}] at @s anchored eyes run tp @e[type=potion,tag=splash,tag=!motioned] @s
 execute as @e[type=potion,tag=splash,tag=!motioned] run function everytick:projectile
 tag @e[type=potion,tag=splash,tag=!motioned] add motioned
@@ -19,7 +19,7 @@ execute if score splash splashtick matches 2 as @e[type=potion,tag=splash] run d
 execute if score splash splashtick matches 2 run scoreboard players set splash splashtick 0
 
 ##Placing water upon impact
-execute as @e[type=area_effect_cloud,nbt={Effects:[{Ambient:0b,ShowIcon:0b,ShowParticles:0b,Duration:1,Id:23b,Amplifier:0b}],Potion:"minecraft:water"},tag=!splash] at @s run data merge entity @s {Duration:200000000,RadiusPerTick:0,RadiusOnUse:0,DurationOnUse:0,Radius:0,Tags:["splash","splash_alone","SmartClearAECsplash"],Particle:"block air"}
+execute as @e[type=area_effect_cloud,nbt={Effects:[{Ambient:0b,ShowIcon:0b,ShowParticles:0b,Duration:1,Id:23,Amplifier:0b}],Potion:"minecraft:water"},tag=!splash] at @s run data merge entity @s {Duration:200000000,RadiusPerTick:0,RadiusOnUse:0,DurationOnUse:0,Radius:0,Tags:["splash","splash_alone","SmartClearAECsplash"],Particle:"block air"}
 #Kill if near spawnpoints
 execute as @e[type=area_effect_cloud,tag=splash_alone,tag=!splashMarked] at @s if entity @e[type=marker,tag=YellowSpawnZone,distance=..3] run kill @s
 execute as @e[type=area_effect_cloud,tag=splash_alone,tag=!splashMarked] at @s if entity @e[type=marker,tag=BlueSpawnZone,distance=..3] run kill @s

diff --git a/rocketriders/data/game/functions/winsplash.mcfunction b/rocketriders/data/game/functions/winsplash.mcfunction
@@ -2,7 +2,7 @@
 
 summon marker ~ ~ ~ {Tags:["RandomWinSplash"]}
 #If you want to add more splashes just increase this number. (amount of splashes + 1)
-scoreboard players set @e[type=marker,tag=RandomWinSplash] RNGmax 72
+scoreboard players set @e[type=marker,tag=RandomWinSplash] RNGmax 73
 
 execute as @e[type=marker,tag=RandomWinSplash] store result score @s RNGscore run data get entity @s UUID[0]
 execute as @e[type=marker,tag=RandomWinSplash] store result score @s RNGscore run scoreboard players operation @s RNGscore %= @s RNGmax
@@ -82,5 +82,6 @@ execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=68}] run title @a
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=69}] run title @a[tag=Winner] subtitle ["",{"text":"Well done, medal is at -224 77 29 (pranked)","color":"green"}]
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=70}] run title @a[tag=Winner] subtitle ["",{"text":"Now, was that so hard?","color":"green"}]
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=71}] run title @a[tag=Winner] subtitle ["",{"text":"Yes Rico, kaboom.","color":"green"}]
+execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=72}] run title @a[tag=Winner] subtitle ["",{"text":"Hasta la vista, baby!","color":"green"}]
 
 kill @e[type=marker,tag=RandomWinSplash]
diff --git a/rocketriders/data/world_updates/functions/1_2_8/update.mcfunction b/rocketriders/data/world_updates/functions/1_2_8/update.mcfunction
@@ -0,0 +1,2 @@
+tellraw @a {"text":"Successfully applied updates from Rocket Riders 1.2.8","color":"green"}
+scoreboard players set $WorldVersion CmdData 1280
diff --git a/rocketriders/data/world_updates/functions/check_updates.mcfunction b/rocketriders/data/world_updates/functions/check_updates.mcfunction
@@ -5,4 +5,5 @@ execute unless score $WorldVersion CmdData matches 1230.. run function world_upd
 execute unless score $WorldVersion CmdData matches 1240.. run function world_updates:1_2_4/update
 execute unless score $WorldVersion CmdData matches 1250.. run function world_updates:1_2_5/update
 execute unless score $WorldVersion CmdData matches 1260.. run function world_updates:1_2_6/update
-execute unless score $WorldVersion CmdData matches 1270.. run function world_updates:1_2_7/update
+execute unless score $WorldVersion CmdData matches 1270.. run function world_updates:1_2_7/update
+execute unless score $WorldVersion CmdData matches 1280.. run function world_updates:1_2_8/update
diff --git a/rr_chase/data/rr_chase/functions/game/winsplash.mcfunction b/rr_chase/data/rr_chase/functions/game/winsplash.mcfunction
@@ -1,7 +1,7 @@
 ##Randomized splash messages for the winners of a game
 summon marker ~ ~ ~ {Tags:["RandomWinSplash"]}
 #If you want to add more splashes just increase this number. (amount of splashes + 1)
-scoreboard players set @e[type=marker,tag=RandomWinSplash] RNGmax 63
+scoreboard players set @e[type=marker,tag=RandomWinSplash] RNGmax 64
 
 execute as @e[type=marker,tag=RandomWinSplash] store result score @s RNGscore run data get entity @s UUID[0]
 execute as @e[type=marker,tag=RandomWinSplash] store result score @s RNGscore run scoreboard players operation @s RNGscore %= @s RNGmax
@@ -69,5 +69,6 @@ execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=59}] run title @a
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=60}] run title @a[tag=Winner] subtitle ["",{"text":"Well done, medal is at -224 77 29 (pranked)","color":"green"}]
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=61}] run title @a[tag=Winner] subtitle ["",{"text":"Now, was that so hard?","color":"green"}]
 execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=62}] run title @a[tag=Winner] subtitle ["",{"text":"Yes Rico, kaboom.","color":"green"}]
+execute as @e[type=marker,tag=RandomWinSplash,scores={RNGscore=63}] run title @a[tag=Winner] subtitle ["",{"text":"Hasta la vista, baby!","color":"green"}]
 
 kill @e[type=marker,tag=RandomWinSplash]
diff --git a/rr_ctf/data/rr_ctf/functions/everytick/flag.mcfunction b/rr_ctf/data/rr_ctf/functions/everytick/flag.mcfunction
@@ -75,11 +75,11 @@ execute as @a[tag=CarryFlag,tag=!DelayActionbar] run title @s actionbar [{"text"
 execute if score FlagWave FlagScore matches 20 if score FY1: FlagScore > 29 FlagScore run place template yellow_flag1 30 71 63
 execute if score FlagWave FlagScore >= 40 FlagScore if score FY1: FlagScore > 29 FlagScore run place template yellow_flag2 30 71 63
 
-execute if score FlagWave FlagScore matches 20 if score FY2: FlagScore > 29 FlagScore run place template yellow_flag1 -10 71 63
-execute if score FlagWave FlagScore >= 40 FlagScore if score FY2: FlagScore > 29 FlagScore run place template yellow_flag2 -10 71 63
+execute if score FlagWave FlagScore matches 20 if score FY2: FlagScore > 29 FlagScore run place template yellow_flag1 -14 71 63
+execute if score FlagWave FlagScore >= 40 FlagScore if score FY2: FlagScore > 29 FlagScore run place template yellow_flag2 -14 71 63
 
-execute if score FlagWave FlagScore matches 20 if score FB1: FlagScore > 29 FlagScore run place template blue_flag1 -10 71 -65
-execute if score FlagWave FlagScore >= 40 FlagScore if score FB1: FlagScore > 29 FlagScore run place template blue_flag2 -10 71 -65
+execute if score FlagWave FlagScore matches 20 if score FB1: FlagScore > 29 FlagScore run place template blue_flag1 -14 71 -65
+execute if score FlagWave FlagScore >= 40 FlagScore if score FB1: FlagScore > 29 FlagScore run place template blue_flag2 -14 71 -65
 
 execute if score FlagWave FlagScore matches 20 if score FB2: FlagScore > 29 FlagScore run place template blue_flag1 30 71 -65
 execute if score FlagWave FlagScore >= 40 FlagScore if score FB2: FlagScore > 29 FlagScore run place template blue_flag2 30 71 -65

diff --git a/rr_powerups/data/rr_powerups/functions/everytick/lava_splash.mcfunction b/rr_powerups/data/rr_powerups/functions/everytick/lava_splash.mcfunction
@@ -1,6 +1,6 @@
 #lavasplash
-execute as @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545}}},tag=!lavasplash] run data merge entity @s {NoGravity:1b,Motion:[0.0,0.0,0.0],Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545,CustomPotionEffects:[{Duration:1,Id:23b,Amplifier:0b,ShowParticles:0b}]}}}
-tag @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545,CustomPotionEffects:[{Duration:1,Id:23b,Amplifier:0b,ShowParticles:0b}]}}},tag=!lavasplash] add lavasplash
+execute as @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545}}},tag=!lavasplash] run data merge entity @s {NoGravity:1b,Motion:[0.0,0.0,0.0],Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545,CustomPotionEffects:[{Duration:1,Id:23,Amplifier:0b,ShowParticles:0b}]}}}
+tag @e[type=potion,nbt={Item:{id:"minecraft:lingering_potion",Count:1b,tag:{Potion:"minecraft:awkward",CustomPotionColor:16747545,CustomPotionEffects:[{Duration:1,Id:23,Amplifier:0b,ShowParticles:0b}]}}},tag=!lavasplash] add lavasplash
 execute as @e[type=potion,tag=lavasplash,tag=!motioned] at @s as @p[scores={ThrowSplash=1..}] at @s anchored eyes run tp @e[type=potion,tag=lavasplash,tag=!motioned] @s
 execute as @e[type=potion,tag=lavasplash,tag=!motioned] run function everytick:projectile
 tag @e[type=potion,tag=lavasplash,tag=!motioned] add motioned
@@ -14,7 +14,7 @@ execute if score lavasplash splashtick matches 1 as @e[type=potion,tag=lavasplas
 execute if score lavasplash splashtick matches 2 as @e[type=potion,tag=lavasplash] run data merge entity @s {Air:1}
 execute if score lavasplash splashtick matches 2 run scoreboard players set lavasplash splashtick 0
 
-execute as @e[type=area_effect_cloud,nbt={Effects:[{Ambient:0b,ShowIcon:0b,ShowParticles:0b,Duration:1,Id:23b,Amplifier:0b}],Potion:"minecraft:awkward"},tag=!lavasplash] run data merge entity @s {Duration:2000000,Radius:0,RadiusPerTick:0,RadiusOnUse:0,DurationOnUse:0,Tags:["lavasplash","lavasplash_alone","SmartClearAECsplash"],Particle:"block air"}
+execute as @e[type=area_effect_cloud,nbt={Effects:[{Ambient:0b,ShowIcon:0b,ShowParticles:0b,Duration:1,Id:23,Amplifier:0b}],Potion:"minecraft:awkward"},tag=!lavasplash] run data merge entity @s {Duration:2000000,Radius:0,RadiusPerTick:0,RadiusOnUse:0,DurationOnUse:0,Tags:["lavasplash","lavasplash_alone","SmartClearAECsplash"],Particle:"block air"}
 
 #Kill if near spawnpoints
 execute as @e[type=area_effect_cloud,tag=lavasplash_alone,tag=!splashMarked] at @s if entity @e[type=marker,tag=YellowSpawnZone,distance=..3] run kill @s

diff --git a/rr_swap/data/rr_swap/functions/game/winblue.mcfunction b/rr_swap/data/rr_swap/functions/game/winblue.mcfunction
@@ -1,2 +1 @@
-execute as @a unless entity @s[team=!Blue,team=!Yellow] run clear @s #rr_swap:clear
 function game:winblue
diff --git a/rr_swap/data/rr_swap/functions/game/winyellow.mcfunction b/rr_swap/data/rr_swap/functions/game/winyellow.mcfunction
@@ -1,2 +1 @@
-execute as @a unless entity @s[team=!Blue,team=!Yellow] run clear @s #rr_swap:clear
 function game:winyellow